From bdf62414f2e0a53a39abcb97152a8d60d8f28cee Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Thu, 26 Nov 2015 16:44:31 +0000 Subject: bitbake: toaster: machines table Fix missing layers information needed for filter The current layers information wasn't being passed to the template for the Select/Add button for the Compatible machines filter. (Bitbake rev: 559102984d3f62a7675899e058166bdf4d552c46) Signed-off-by: Michael Wood Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/tables.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/tables.py') diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 9c9cda4e95..be8916c468 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -217,12 +217,10 @@ class MachinesTable(ToasterTable, ProjectFiltersMixin): def get_context_data(self, **kwargs): context = super(MachinesTable, self).get_context_data(**kwargs) context['project'] = Project.objects.get(pk=kwargs['pid']) - context['projectlayers'] = map(lambda prjlayer: prjlayer.layercommit.id, ProjectLayer.objects.filter(project=context['project'])) return context def setup_filters(self, *args, **kwargs): project = Project.objects.get(pk=kwargs['pid']) - self.project_layers = project.get_project_layer_versions() self.add_filter(title="Filter by project machines", name="in_current_project", @@ -236,6 +234,10 @@ class MachinesTable(ToasterTable, ProjectFiltersMixin): self.queryset = prj.get_all_compatible_machines() self.queryset = self.queryset.order_by(self.default_orderby) + self.static_context_extra['current_layers'] = \ + self.project_layers = \ + prj.get_project_layer_versions(pk=True) + def setup_columns(self, *args, **kwargs): self.add_column(title="Machine", -- cgit v1.2.3-54-g00ecf