diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2015-02-09 13:54:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-10 23:07:51 +0000 |
| commit | c8a8288f49ef7a4f3b59289034570bba440c81bd (patch) | |
| tree | 0ad8b21ccaadd9f81fcd62b582502f865b84b290 /bitbake | |
| parent | ea7d2461b4a70252cb14cda07677e6d561a94d4b (diff) | |
| download | ast2050-yocto-poky-c8a8288f49ef7a4f3b59289034570bba440c81bd.zip ast2050-yocto-poky-c8a8288f49ef7a4f3b59289034570bba440c81bd.tar.gz | |
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 <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 255b6a3..a7f58ad 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', |
