[oe-commits] [bitbake] 14/19: toaster: remove custom images from Image Recipes

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit 18a93b360301a5497d5c8ef74ab71f374f2ad210
Author: Dave Lerner <dave.lerner at windriver.com>
AuthorDate: Tue Feb 23 12:34:45 2016 +0000

    toaster: remove custom images from Image Recipes
    
    Fix the view of 'Image Recipes' under 'Configuration' to only show
    image recipes that are not customised since custom images have their
    own page.
    
    [YOCTO #9111]
    
    Signed-off-by: Dave Lerner <dave.lerner at windriver.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/toastergui/tables.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index b51e1b4..9115309 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/lib/toaster/toastergui/tables.py
@@ -549,7 +549,10 @@ class ImageRecipesTable(RecipesTable):
     def setup_queryset(self, *args, **kwargs):
         super(ImageRecipesTable, self).setup_queryset(*args, **kwargs)
 
-        self.queryset = self.queryset.filter(is_image=True)
+        custom_image_recipes = CustomImageRecipe.objects.filter(
+                project=kwargs['pid'])
+        self.queryset = self.queryset.filter(
+                Q(is_image=True) & ~Q(pk__in=custom_image_recipes))
         self.queryset = self.queryset.order_by(self.default_orderby)
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.