From c8a8288f49ef7a4f3b59289034570bba440c81bd Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 9 Feb 2015 13:54:14 +0000 Subject: [PATCH] bitbake: toaster: All machines Fix filter counts Filter counts needed to take into account the filters that had previously been applied. (Bitbake rev: 97ef99ea5107543799ec2386b3840b435347edfb) Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 255b6a370d..a7f58ad5e1 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2814,11 +2814,6 @@ if toastermain.settings.MANAGED: queryset_all = queryset_all.exclude(layer_version__in=project_layers) by_pass_filter_string = True - selected_filter_count = { - 'inprj' : queryset_all.filter(layer_version__in=project_layers).count(), - 'notinprj' : queryset_all.exclude(layer_version__in=project_layers).count() - } - # END FILTERS if by_pass_filter_string: @@ -2834,13 +2829,16 @@ if toastermain.settings.MANAGED: queryset = queryset.exclude(layer_version__in=to_rm) machine_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1)) + selected_filter_count = {} + selected_filter_count['inprj'] = queryset.filter(layer_version__in=project_layers).count() + selected_filter_count['notinprj'] = queryset.count() - selected_filter_count['inprj'] context = { 'objects' : machine_info, 'project_layers' : project_layers, 'objectname' : "machines", 'default_orderby' : 'name:+', - 'total_count': machine_info.paginator.count, + 'total_count': queryset.count(), 'tablecols' : [ { 'name': 'Machine',