From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 0E761E00C4C; Mon, 22 Feb 2016 08:40:54 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.54 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 1AD40E00B70 for ; Mon, 22 Feb 2016 08:40:52 -0800 (PST) Received: by mail-wm0-f54.google.com with SMTP id c200so180622092wme.0 for ; Mon, 22 Feb 2016 08:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=pkqbDCCJJVX0v3qnI9O1jsZI94NQ4pUDte57o/weCEM=; b=kRnYfYTz6KQs8I1AsbJyFKRdI44x2AtG3Q/KDbky+d+fJc9YXQcfe3sLdDXU/7Ac9Z DTD2qOBsutxfs6RYHK4ecczkwcoYB9nfOdj7p267mNyKJKkEbl2/U4divPeyj6fjqJJO hcf3x0wTCVacQcKWjwmND7sZFdZnsoi3z/DdAiCyGT+Oev4CzfsEDjp0gKxgdkAr06UC u4GjOVQQ+8Bs77Iz5QtlFDKL1dRdO4ww7g7zYWsZ1BWtWl2iXotvZTTjOJsbEh8CsQJQ rNdY1vhXgyN6OFX6UzbfHvQisBEmWaShkSyWrRsWu0tvWP1KxLfNpJEag7TqiLE2bvVj jiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=pkqbDCCJJVX0v3qnI9O1jsZI94NQ4pUDte57o/weCEM=; b=mk0TVZ4r+/rhgxIR+KqPEW5iGd8JuewsuEIv25BGGI5oHx1aacobhO5UAKyB5P82VE kl0LM2Ug1f/nkb9sFfWGOdYTXs1gSTSsRvpJlZtRQXfdE1dgP6DZsk8Ql0r0Y6UIlVhQ dqeNGuxsPY2k2ejLWM5xfiIWh/gYm0tkZJjx2pLN1dRqu95ki44N1lRt1zSBSbCY8fbc cxmGh301p18PZHYK3pNlVcmbqETnL3bXqQQ31Lf+HS/597925oFlyLTziG9i/q9ld72A bG9bUGjL+kRIEYUTsIkFW0IRW9gKGlbOjyodARyJbgIYpGAwzZyIk/zHDd5xNmWYbpEB gicw== X-Gm-Message-State: AG10YOR+jtKKgjBXOg93OOyGbGv6OFowjuNGqFWrl5KW8DalI/p9pL6sdam0BApnjU+Zi1kY X-Received: by 10.194.187.240 with SMTP id fv16mr33868761wjc.53.1456159251607; Mon, 22 Feb 2016 08:40:51 -0800 (PST) Received: from [192.168.0.44] (host109-149-84-27.range109-149.btcentralplus.com. [109.149.84.27]) by smtp.googlemail.com with ESMTPSA id t3sm25504541wjz.11.2016.02.22.08.40.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Feb 2016 08:40:50 -0800 (PST) To: Dave Lerner , toaster@yoctoproject.org, belen.barros.pena@linux.intel.com References: <1455921136-26353-1-git-send-email-dave.lerner@windriver.com> <1455921136-26353-2-git-send-email-dave.lerner@windriver.com> From: Michael Wood Message-ID: <56CB3A11.4070606@intel.com> Date: Mon, 22 Feb 2016 16:40:49 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1455921136-26353-2-git-send-email-dave.lerner@windriver.com> Subject: Re: [PATCH 1/1] toaster: remove custom images from Image Recipes X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2016 16:40:54 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 19/02/16 22:32, Dave Lerner 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 > > Signed-off-by: Dave Lerner > --- > bitbake/lib/toaster/toastergui/tables.py | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py > index 86d111d..50a18e7 100644 > --- a/bitbake/lib/toaster/toastergui/tables.py > +++ b/bitbake/lib/toaster/toastergui/tables.py > @@ -549,7 +549,9 @@ 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.all() One minor thing, we can make this QuerySet a bit more lightweight by using the project field e.g. CustomImageRecipe.objects.filter(project=kwargs['pid']) so that we're only doing a query of all in the current project. > + self.queryset = self.queryset.filter( > + Q(is_image=True) & ~Q(pk__in=custom_image_recipes)) > self.queryset = self.queryset.order_by(self.default_orderby) > >