From 5d021f6de6973e5573dc4c2425b1faf33b5e9f98 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 13 Mar 2015 17:13:25 +0000 Subject: bitbake: toastergui: fix machines page search This patch fixes the machine page search. [YOCTO #7407] (Bitbake rev: 51c6e3edf074da6ebd8b347f13dc0f88b25c0111) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 439c068515..fa34e5622f 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2867,15 +2867,17 @@ if toastermain.settings.MANAGED: # for that object type. copypasta for all needed table searches (filter_string, search_term, ordering_string) = _search_tuple(request, Machine) - queryset_all = Machine.objects.all() - queryset_all = queryset_all.prefetch_related('layer_version') - prj = Project.objects.get(pk = request.session['project_id']) compatible_layers = prj.compatible_layerversions() + queryset_all = Machine.objects.filter(layer_version__in=compatible_layers) + queryset_all = _get_queryset(Machine, queryset_all, None, search_term, ordering_string, 'name') + + queryset_all = queryset_all.prefetch_related('layer_version') + + # Make sure we only show machines / layers which are compatible # with the current project - queryset_all = queryset_all.filter(layer_version__in=compatible_layers) project_layers = ProjectLayer.objects.filter(project_id=request.session['project_id']).values_list('layercommit',flat=True) -- cgit v1.2.3-54-g00ecf