From 4dc8edb610f1a01c5f40fd54cc5198a1e2b0dd25 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Mon, 19 Jan 2015 15:14:39 +0000 Subject: bitbake: toastergui: save cookie for orderby/page size settings We save the current settings as cookies on the server side for the layers, targets and machines pages under Project pages. [YOCTO #6961] (Bitbake rev: 58b35c055e37b5e1552d8ba3db2e05ea4ee85023) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/templates/targets.html | 2 -- bitbake/lib/toaster/toastergui/views.py | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html index cc339fbbb7..590ecb9a0e 100644 --- a/bitbake/lib/toaster/toastergui/templates/targets.html +++ b/bitbake/lib/toaster/toastergui/templates/targets.html @@ -39,7 +39,6 @@ {% include "basetable_top.html" %} {% for o in objects %} - {% if o.name %} {{o.name}} @@ -79,7 +78,6 @@ - {% endif %} {% endfor %} {% include "basetable_bottom.html" %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 5fcad63e45..4d00fbd551 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2560,7 +2560,10 @@ if toastermain.settings.MANAGED: ] } - return render(request, template, context) + response = render(request, template, context) + _save_parameters_cookies(response, pagesize, orderby, request) + + return response def layerdetails(request, layerid): template = "layerdetails.html" @@ -2626,7 +2629,7 @@ if toastermain.settings.MANAGED: (filter_string, search_term, ordering_string) = _search_tuple(request, Recipe) prj = Project.objects.get(pk = request.session['project_id']) - queryset_all = Recipe.objects.filter(Q(layer_version__up_branch__name= prj.release.name) | Q(layer_version__build__in = prj.build_set.all())) + queryset_all = Recipe.objects.filter(Q(layer_version__up_branch__name= prj.release.name) | Q(layer_version__build__in = prj.build_set.all())).filter(name__regex=r'.{1,}.*') queryset_with_search = _get_queryset(Recipe, queryset_all, None, search_term, ordering_string, '-name') @@ -2711,8 +2714,10 @@ if toastermain.settings.MANAGED: } }, ] + response = render(request, template, context) + _save_parameters_cookies(response, pagesize, orderby, request) - return render(request, template, context) + return response def machines(request): template = "machines.html" @@ -2783,8 +2788,10 @@ if toastermain.settings.MANAGED: ] } + response = render(request, template, context) + _save_parameters_cookies(response, pagesize, orderby, request) - return render(request, template, context) + return response def get_project_configvars_context(): -- cgit v1.2.3-54-g00ecf