]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
toastergui: fix all targets page search
authorAlexandru DAMIAN <alexandru.damian@intel.com>
Tue, 20 Jan 2015 16:37:53 +0000 (16:37 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Jan 2015 11:33:46 +0000 (11:33 +0000)
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]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
lib/toaster/toastergui/views.py

index 6b4b5d9936d8db13d232c7b836b7b22c677821c3..616b57ca2fa6489933e78ed03ac19f9ab48e80f8 100755 (executable)
@@ -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',