From ece39b4c47a5c9b55c291d6b4acdeb29e8d8884f Mon Sep 17 00:00:00 2001 From: David Reyna Date: Fri, 27 Feb 2015 00:47:32 -0800 Subject: bitbake: toaster: reconcile non-manage-mode landing classes Remove obsolete manage-mode URLs, fix not-manage mode landing classes that have obsolete non-matching parameter lists, remove orphaned landing classes.. [YOCTO #6483] (Bitbake rev: 76c54a79c4e26cefa5e72ca1cb14bc9d46e8f9dd) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/urls.py | 2 -- bitbake/lib/toaster/toastergui/views.py | 13 +++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index fc03f19a7f..64f790293a 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -78,13 +78,11 @@ urlpatterns = patterns('toastergui.views', url(r'^layers/$', 'layers', name='layers'), url(r'^layer/(?P\d+)/$', 'layerdetails', name='layerdetails'), - url(r'^layer/$', 'layerdetails', name='layerdetails'), url(r'^targets/$', 'targets', name='all-targets'), url(r'^machines/$', 'machines', name='machines'), url(r'^projects/$', 'projects', name='all-projects'), - url(r'^project/$', 'project', name='project'), url(r'^project/(?P\d+)/$', 'project', name='project'), url(r'^project/(?P\d+)/configuration$', 'projectconf', name='projectconf'), url(r'^project/(?P\d+)/builds$', 'projectbuilds', name='projectbuilds'), diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index df893483c6..14029813e8 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -3400,7 +3400,7 @@ else: def xhr_projectbuild(request, pid): return render(request, 'landing_not_managed.html') - def xhr_build(request, pid): + def xhr_build(request): return render(request, 'landing_not_managed.html') def xhr_projectinfo(request): @@ -3412,7 +3412,7 @@ else: def xhr_datatypeahead(request): return render(request, 'landing_not_managed.html') - def xhr_configvaredit(request): + def xhr_configvaredit(request, pid): return render(request, 'landing_not_managed.html') def importlayer(request): @@ -3421,22 +3421,19 @@ else: def layers(request): return render(request, 'landing_not_managed.html') - def layerdetails(request): + def layerdetails(request, layerid): return render(request, 'landing_not_managed.html') def targets(request): return render(request, 'landing_not_managed.html') - def targetdetails(request): - return render(request, 'landing_not_managed.html') - def machines(request): return render(request, 'landing_not_managed.html') - def projectconf(request): + def projectconf(request, pid): return render(request, 'landing_not_managed.html') - def projectbuilds(request): + def projectbuilds(request, pid): return render(request, 'landing_not_managed.html') def build_artifact(request, build_id, artifact_type, artifact_id): -- cgit v1.2.3-54-g00ecf