From 4571c827a4491132a8e85a721c816a2a2fff3ce7 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 20 Jan 2015 15:57:11 +0000 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/templates/project.html | 2 +- bitbake/lib/toaster/toastergui/urls.py | 2 +- bitbake/lib/toaster/toastergui/views.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake') 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

- + View all targets {% 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', 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='targets'), + url(r'^targets/$', 'targets', name='all-targets'), url(r'^machines/$', 'machines', name='machines'), 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: mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby' : orderby } retval = _verify_parameters( request.GET, mandatory_parameters ) if retval: - return _redirect_parameters( 'targets', request.GET, mandatory_parameters) + return _redirect_parameters( 'all-targets', request.GET, mandatory_parameters) (filter_string, search_term, ordering_string) = _search_tuple(request, Recipe) prj = Project.objects.get(pk = request.session['project_id']) -- cgit v1.2.3-54-g00ecf