[review-request version2] remove custom images from Image Recipes page

[review-request version2] remove custom images from Image Recipes page

[Dave Lerner]

Branch: master
Defect: bz9111
Summary: don't show custom images on Configuration | Image Recipes page

Tests
-----
Create custom image xxxxx based on core-image-minimal and build it.
View Image Recipes page.
Verify that core-image-minimal is in the list and 
    verify that xxxxx is not in the list.

View custom image page.
Verify that xxxxx *is* in the list.





   

[PATCH 1/1 Version 2] toaster: remove custom images from Image Recipes

[Dave Lerner]

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@windriver.com>
---
 bitbake/lib/toaster/toastergui/tables.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 86d111d..48a55de 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/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)
 
 
-- 
1.9.1

Re: [PATCH 1/1 Version 2] toaster: remove custom images from Image Recipes

[Barros Pena, Belen]

On 23/02/2016 00:16, "toaster-bounces@yoctoproject.org on behalf of Dave
Lerner" <toaster-bounces@yoctoproject.org on behalf of
dave.lerner@windriver.com> wrote:

>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]

From the UI side of things, this is good.

Thanks!

Belén

>
>Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
>---
> bitbake/lib/toaster/toastergui/tables.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/bitbake/lib/toaster/toastergui/tables.py
>b/bitbake/lib/toaster/toastergui/tables.py
>index 86d111d..48a55de 100644
>--- a/bitbake/lib/toaster/toastergui/tables.py
>+++ b/bitbake/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)
> 
> 
>-- 
>1.9.1
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

Re: [PATCH 1/1 Version 2] toaster: remove custom images from Image Recipes

[Michael Wood]

Thanks patch sent to bitbake-devel and pushed to toaster-next

On 23/02/16 11:29, Barros Pena, Belen wrote:
>
> On 23/02/2016 00:16, "toaster-bounces@yoctoproject.org on behalf of Dave
> Lerner" <toaster-bounces@yoctoproject.org on behalf of
> dave.lerner@windriver.com> wrote:
>
>> 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]
>  From the UI side of things, this is good.
>
> Thanks!
>
> Belén
>
>> Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
>> ---
>> bitbake/lib/toaster/toastergui/tables.py | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/bitbake/lib/toaster/toastergui/tables.py
>> b/bitbake/lib/toaster/toastergui/tables.py
>> index 86d111d..48a55de 100644
>> --- a/bitbake/lib/toaster/toastergui/tables.py
>> +++ b/bitbake/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)
>>
>>
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> toaster mailing list
>> toaster@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/toaster