summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-13 17:13:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-21 00:00:01 +0000
commit51c6e3edf074da6ebd8b347f13dc0f88b25c0111 (patch)
treec889f17fc2fc1a3fb8000921e0516ed75ede92b3
parent6b46f436296683f7a2f72ac978ef30d0a38ad7a4 (diff)
downloadbitbake-51c6e3edf074da6ebd8b347f13dc0f88b25c0111.tar.gz
toastergui: fix machines page search
This patch fixes the machine page search. [YOCTO #7407] Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
-rwxr-xr-xlib/toaster/toastergui/views.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 439c06851..fa34e5622 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)