sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Michael Wood 2015-02-09 13:54:14 +00:00 committed by Richard Purdie
parent ea7d2461b4
commit c8a8288f49
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/toaster/toastergui/views.py
View File

@ -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',