From: Alexandru DAMIAN Date: Fri, 13 Mar 2015 17:13:25 +0000 (+0000) Subject: toastergui: fix machines page search X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c6e3edf074da6ebd8b347f13dc0f88b25c0111;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toastergui: fix machines page search This patch fixes the machine page search. [YOCTO #7407] Signed-off-by: Alexandru DAMIAN --- diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 439c0685154..fa34e5622f3 100755 --- a/lib/toaster/toastergui/views.py +++ b/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)