aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-20 16:37:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:33:53 +0000
commitc546815eeea92ebda4fe4120a7634218db763892 (patch)
tree23064d3c5540652e1f87f05d5bc7859f1fff212a /bitbake
parent4571c827a4491132a8e85a721c816a2a2fff3ce7 (diff)
downloadopenembedded-core-contrib-c546815eeea92ebda4fe4120a7634218db763892.tar.gz
bitbake: toastergui: fix all targets page search
This fixes the display of layers in all-targets page search/filtering usage pattern by displaying layer-equivalence class. The significant impact is the correct display of the list size for search/filtering actions [YOCTO #7051] (Bitbake rev: 4957ec63a11d51dfac2252263e4d26c705eb31e9) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 6b4b5d9936..616b57ca2f 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2494,9 +2494,12 @@ if toastermain.settings.MANAGED:
queryset_all = _get_queryset(Layer_Version, queryset_all, filter_string, search_term, ordering_string, '-layer__name')
+ object_list = set([x.get_equivalents_wpriority(prj)[0] for x in queryset_all])
+ object_list = list(object_list)
+
# retrieve the objects that will be displayed in the table; layers a paginator and gets a page range to display
- layer_info = _build_page_range(Paginator(queryset_all, request.GET.get('count', 10)),request.GET.get('page', 1))
+ layer_info = _build_page_range(Paginator(object_list, request.GET.get('count', 10)),request.GET.get('page', 1))
context = {
@@ -2504,7 +2507,7 @@ if toastermain.settings.MANAGED:
'objects' : layer_info,
'objectname' : "layers",
'default_orderby' : 'layer__name:+',
- 'total_count': queryset_all.count(),
+ 'total_count': len(object_list),
'tablecols' : [
{ 'name': 'Layer',