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]

Signed-off-by: David Reyna <David.Reyna@windriver.com>

diff --git a/lib/toaster/toastergui/urls.py b/lib/toaster/toastergui/urls.py
index fc03f19a7f2cc34c612f4dd8dbd6234622c4f9c3..64f790293a7ee2acf06d5e1f1005b63d968919f5 100644 (file)
--- a/lib/toaster/toastergui/urls.py
+++ b/lib/toaster/toastergui/urls.py
@@ -78,13 +78,11 @@ urlpatterns = patterns('toastergui.views',
 
         url(r'^layers/$', 'layers', name='layers'),
         url(r'^layer/(?P<layerid>\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<pid>\d+)/$', 'project', name='project'),
         url(r'^project/(?P<pid>\d+)/configuration$', 'projectconf', name='projectconf'),
         url(r'^project/(?P<pid>\d+)/builds$', 'projectbuilds', name='projectbuilds'),

diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index df893483c69e81dc7f73fba1fbcaeec8e4d3572b..14029813e8dbf6627fa768ada0fdc3f2d66a7241 100755 (executable)
--- a/lib/toaster/toastergui/views.py
+++ b/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):