From: Dave Lerner Date: Tue, 23 Feb 2016 12:34:45 +0000 (+0000) Subject: toaster: remove custom images from Image Recipes X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18a93b360301a5497d5c8ef74ab71f374f2ad210;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py index b51e1b4f493..91153099ea0 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)