[bitbake-devel] [PATCH 01/12] toastergui: save cookie for orderby/page size settings
Alex DAMIAN
alexandru.damian at intel.com
Wed Jan 21 17:01:31 UTC 2015
From: Alexandru DAMIAN <alexandru.damian at intel.com>
We save the current settings as cookies on the server side
for the layers, targets and machines pages under Project pages.
[YOCTO #6961]
Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
lib/toaster/toastergui/templates/targets.html | 2 --
lib/toaster/toastergui/views.py | 15 +++++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/toaster/toastergui/templates/targets.html b/lib/toaster/toastergui/templates/targets.html
index cc339fb..590ecb9 100644
--- a/lib/toaster/toastergui/templates/targets.html
+++ b/lib/toaster/toastergui/templates/targets.html
@@ -39,7 +39,6 @@
{% include "basetable_top.html" %}
{% for o in objects %}
- {% if o.name %}
<tr class="data">
<td class="target">
{{o.name}}
@@ -79,7 +78,6 @@
</a>
</td>
</tr>
- {% endif %}
{% endfor %}
{% include "basetable_bottom.html" %}
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 5fcad63..4d00fbd 100755
--- a/lib/toaster/toastergui/views.py
+++ b/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():
--
1.9.1
More information about the bitbake-devel
mailing list