From 124157b567469639c6c839233f42049a093ba083 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 29 Jun 2015 16:01:37 +0100 Subject: toaster: Partial Revert "fixes after html5 compliance testing" Partial revert of bb commit 7aecb974d44d9bc711ffba5cc65e770811397fba There were changes in this commit which broke the compatible layers mechanism meaning that no layers, recipes or machines were showing. Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- lib/toaster/orm/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 7e8ab16cf..4ea75f2bf 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -180,9 +180,8 @@ class Project(models.Model): if release == None: release = self.release # layers on the same branch or layers specifically set for this project - queryset = Layer_Version.objects.filter(Q(project = self) | Q(build__project = self)) - if release is not None: - queryset = queryset.filter(Q(up_branch__name = release.branch_name) & Q(project = None)) + queryset = Layer_Version.objects.filter((Q(up_branch__name = release.branch_name) & Q(project = None)) | Q(project = self) | Q(build__project = self)) + if layer_name is not None: # we select only a layer name queryset = queryset.filter(layer__name = layer_name) -- cgit 1.2.3-korg