diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-01-20 15:57:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:33:53 +0000 |
commit | 4571c827a4491132a8e85a721c816a2a2fff3ce7 (patch) | |
tree | aa9a3caaac6a52cec737473372e11812f31fbc04 /bitbake | |
parent | 8e3be3f268d96f65af8d6bf62162f71783afa478 (diff) | |
download | poky-4571c827a4491132a8e85a721c816a2a2fff3ce7.tar.gz |
bitbake: toastergui: fix all-targets redirect
Fixes the all targets redirect to /api/1.0/targets.
[YOCTO #7147]
(Bitbake rev: f1cccafb4c7aa2c338e29ec5d2ea190dfeceb132)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/urls.py | 2 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 67b267256b..815c24c4b5 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
@@ -98,7 +98,7 @@ vim: expandtab tabstop=2 | |||
98 | </div> | 98 | </div> |
99 | <i class="icon-question-sign get-help get-help-blue" title="Type the name of one or more targets you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to a target name, like so: <code>core-image-minimal:do_build</code>"></i> | 99 | <i class="icon-question-sign get-help get-help-blue" title="Type the name of one or more targets you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to a target name, like so: <code>core-image-minimal:do_build</code>"></i> |
100 | <p> | 100 | <p> |
101 | <a href="{% url 'targets' %}"> | 101 | <a href="{% url 'all-targets' %}"> |
102 | View all targets | 102 | View all targets |
103 | </a> | 103 | </a> |
104 | {% if completedbuilds.count %} | 104 | {% if completedbuilds.count %} |
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index c74c7a651b..8c3b5a85fd 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py | |||
@@ -77,7 +77,7 @@ urlpatterns = patterns('toastergui.views', | |||
77 | url(r'^layers/$', 'layers', name='layers'), | 77 | url(r'^layers/$', 'layers', name='layers'), |
78 | url(r'^layer/(?P<layerid>\d+)/$', 'layerdetails', name='layerdetails'), | 78 | url(r'^layer/(?P<layerid>\d+)/$', 'layerdetails', name='layerdetails'), |
79 | url(r'^layer/$', 'layerdetails', name='layerdetails'), | 79 | url(r'^layer/$', 'layerdetails', name='layerdetails'), |
80 | url(r'^targets/$', 'targets', name='targets'), | 80 | url(r'^targets/$', 'targets', name='all-targets'), |
81 | url(r'^machines/$', 'machines', name='machines'), | 81 | url(r'^machines/$', 'machines', name='machines'), |
82 | 82 | ||
83 | url(r'^projects/$', 'projects', name='all-projects'), | 83 | url(r'^projects/$', 'projects', name='all-projects'), |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 7a11bbd807..6b4b5d9936 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2625,7 +2625,7 @@ if toastermain.settings.MANAGED: | |||
2625 | mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby' : orderby } | 2625 | mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby' : orderby } |
2626 | retval = _verify_parameters( request.GET, mandatory_parameters ) | 2626 | retval = _verify_parameters( request.GET, mandatory_parameters ) |
2627 | if retval: | 2627 | if retval: |
2628 | return _redirect_parameters( 'targets', request.GET, mandatory_parameters) | 2628 | return _redirect_parameters( 'all-targets', request.GET, mandatory_parameters) |
2629 | (filter_string, search_term, ordering_string) = _search_tuple(request, Recipe) | 2629 | (filter_string, search_term, ordering_string) = _search_tuple(request, Recipe) |
2630 | 2630 | ||
2631 | prj = Project.objects.get(pk = request.session['project_id']) | 2631 | prj = Project.objects.get(pk = request.session['project_id']) |