diff options
Diffstat (limited to 'bitbake')
5 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 62cc7ad94c..a781224ea1 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
@@ -34,7 +34,7 @@ | |||
34 | var ctx = {}; | 34 | var ctx = {}; |
35 | ctx.xhrDataTypeaheadUrl = "{% url 'xhr_datatypeahead' %}"; | 35 | ctx.xhrDataTypeaheadUrl = "{% url 'xhr_datatypeahead' %}"; |
36 | ctx.projectBuildUrl = "{% url 'xhr_build' %}"; | 36 | ctx.projectBuildUrl = "{% url 'xhr_build' %}"; |
37 | ctx.projectPageUrl = "{% url 'project' %}"; | 37 | ctx.projectPageUrl = "{% url 'base_project' %}"; |
38 | ctx.projectInfoUrl = "{% url 'xhr_projectinfo' %}"; | 38 | ctx.projectInfoUrl = "{% url 'xhr_projectinfo' %}"; |
39 | ctx.numProjects = {{projects|length}}; | 39 | ctx.numProjects = {{projects|length}}; |
40 | {% if project %} | 40 | {% if project %} |
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index 19d2fc4af8..6b2111a1f4 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -14,7 +14,7 @@ | |||
14 | $(document).ready(function (){ | 14 | $(document).ready(function (){ |
15 | var ctx = { | 15 | var ctx = { |
16 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", | 16 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", |
17 | layerDetailsUrl : "{% url 'layerdetails' %}", | 17 | layerDetailsUrl : "{% url 'base_layerdetails' %}", |
18 | xhrImportLayerUrl : "{% url 'xhr_importlayer' %}", | 18 | xhrImportLayerUrl : "{% url 'xhr_importlayer' %}", |
19 | xhrEditProjectUrl : "{% url 'xhr_projectedit' project.id %}", | 19 | xhrEditProjectUrl : "{% url 'xhr_projectedit' project.id %}", |
20 | projectPageUrl : "{% url 'project' project.id %}", | 20 | projectPageUrl : "{% url 'project' project.id %}", |
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index c3a50dff29..67033b1e07 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
@@ -17,7 +17,7 @@ | |||
17 | $(document).ready(function (){ | 17 | $(document).ready(function (){ |
18 | var ctx = { | 18 | var ctx = { |
19 | projectBuildUrl : "{% url 'xhr_build' %}", | 19 | projectBuildUrl : "{% url 'xhr_build' %}", |
20 | layerDetailsUrl : "{% url 'layerdetails' %}", | 20 | layerDetailsUrl : "{% url 'base_layerdetails' %}", |
21 | projectPageUrl : "{% url 'project' project.id %}", | 21 | projectPageUrl : "{% url 'project' project.id %}", |
22 | xhrEditProjectUrl : "{% url 'xhr_projectedit' project.id %}", | 22 | xhrEditProjectUrl : "{% url 'xhr_projectedit' project.id %}", |
23 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", | 23 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", |
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index a8cb917c6d..58b524eaa8 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
@@ -426,7 +426,7 @@ angular.element(document).ready(function() { | |||
426 | scope.urls.layers = "{% url 'layers' %}"; | 426 | scope.urls.layers = "{% url 'layers' %}"; |
427 | scope.urls.targets = "{% url 'targets' %}"; | 427 | scope.urls.targets = "{% url 'targets' %}"; |
428 | scope.urls.importlayer = "{% url 'importlayer'%}"; | 428 | scope.urls.importlayer = "{% url 'importlayer'%}"; |
429 | scope.urls.layer = "{% url 'layerdetails' %}"; | 429 | scope.urls.layer = "{% url 'base_layerdetails' %}"; |
430 | scope.project = {{prj|json}}; | 430 | scope.project = {{prj|json}}; |
431 | scope.builds = {{builds|json}}; | 431 | scope.builds = {{builds|json}}; |
432 | scope.layers = {{layers|json}}; | 432 | scope.layers = {{layers|json}}; |
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 64f790293a..8a7fef1dee 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py | |||
@@ -19,6 +19,8 @@ | |||
19 | from django.conf.urls import patterns, include, url | 19 | from django.conf.urls import patterns, include, url |
20 | from django.views.generic import RedirectView | 20 | from django.views.generic import RedirectView |
21 | 21 | ||
22 | from django.http import HttpResponseBadRequest | ||
23 | |||
22 | urlpatterns = patterns('toastergui.views', | 24 | urlpatterns = patterns('toastergui.views', |
23 | # landing page | 25 | # landing page |
24 | url(r'^landing/$', 'landing', name='landing'), | 26 | url(r'^landing/$', 'landing', name='landing'), |
@@ -78,11 +80,13 @@ urlpatterns = patterns('toastergui.views', | |||
78 | 80 | ||
79 | url(r'^layers/$', 'layers', name='layers'), | 81 | url(r'^layers/$', 'layers', name='layers'), |
80 | url(r'^layer/(?P<layerid>\d+)/$', 'layerdetails', name='layerdetails'), | 82 | url(r'^layer/(?P<layerid>\d+)/$', 'layerdetails', name='layerdetails'), |
83 | url(r'^layer/$', lambda x: HttpResponseBadRequest(), name='base_layerdetails'), | ||
81 | url(r'^targets/$', 'targets', name='all-targets'), | 84 | url(r'^targets/$', 'targets', name='all-targets'), |
82 | url(r'^machines/$', 'machines', name='machines'), | 85 | url(r'^machines/$', 'machines', name='machines'), |
83 | 86 | ||
84 | url(r'^projects/$', 'projects', name='all-projects'), | 87 | url(r'^projects/$', 'projects', name='all-projects'), |
85 | 88 | ||
89 | url(r'^project/$', lambda x: HttpResponseBadRequest(), name='base_project'), | ||
86 | url(r'^project/(?P<pid>\d+)/$', 'project', name='project'), | 90 | url(r'^project/(?P<pid>\d+)/$', 'project', name='project'), |
87 | url(r'^project/(?P<pid>\d+)/configuration$', 'projectconf', name='projectconf'), | 91 | url(r'^project/(?P<pid>\d+)/configuration$', 'projectconf', name='projectconf'), |
88 | url(r'^project/(?P<pid>\d+)/builds$', 'projectbuilds', name='projectbuilds'), | 92 | url(r'^project/(?P<pid>\d+)/builds$', 'projectbuilds', name='projectbuilds'), |