From 68128ad2f1ab2004e64511c2ce9162cdfa6a9cb5 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Tue, 4 Aug 2015 22:46:31 +0300 Subject: bitbake: toastergui: tables Use util functions for the common querysets Use the new utils functions on the project object to get the common querysets that we also use in tables. (Bitbake rev: 5e013a9bc3deb03bd6bac357b9ecb81c3c77b255) Signed-off-by: Michael Wood Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/tables.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 8d5166be55..e4cbec193e 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -251,9 +251,8 @@ class MachinesTable(ToasterTable, ProjectFiltersMixin): def setup_queryset(self, *args, **kwargs): prj = Project.objects.get(pk = kwargs['pid']) - compatible_layers = prj.compatible_layerversions() - - self.queryset = Machine.objects.filter(layer_version__in=compatible_layers).order_by(self.default_orderby) + self.queryset = prj.get_all_compatible_machines() + self.queryset = self.queryset.order_by(self.default_orderby) def setup_columns(self, *args, **kwargs): @@ -363,11 +362,7 @@ class RecipesTable(ToasterTable, ProjectFiltersMixin): def setup_queryset(self, *args, **kwargs): prj = Project.objects.get(pk = kwargs['pid']) - self.queryset = Recipe.objects.filter(layer_version__in = prj.compatible_layerversions()) - - search_maxids = map(lambda i: i[0], list(self.queryset.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id'))) - - self.queryset = self.queryset.filter(id__in=search_maxids).select_related('layer_version', 'layer_version__layer', 'layer_version__up_branch', 'layer_source') + self.queryset = prj.get_all_compatible_recipes() self.queryset = self.queryset.order_by(self.default_orderby) -- cgit v1.2.3-54-g00ecf