Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id C5DB0E00CC4; Wed, 2 Sep 2015 01:57:27 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.24 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id E423EE00CC3 for ; Wed, 2 Sep 2015 01:57:21 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 02 Sep 2015 01:57:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,452,1437462000"; d="scan'208";a="796529220" Received: from gionescx-mobl1.ger.corp.intel.com (HELO lp.ger.corp.intel.com) ([10.252.26.81]) by fmsmga002.fm.intel.com with ESMTP; 02 Sep 2015 01:57:15 -0700 From: Elliot Smith To: toaster@yoctoproject.org Date: Wed, 2 Sep 2015 09:56:51 +0100 Message-Id: <1441184214-8074-4-git-send-email-elliot.smith@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1441184214-8074-1-git-send-email-elliot.smith@intel.com> References: <1441184214-8074-1-git-send-email-elliot.smith@intel.com> Subject: [review-request][PATCH 3/6] toaster: Only redirect to projects page if user has added projects 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: Wed, 02 Sep 2015 08:57:27 -0000 The landing page currently redirects the user if there are any projects in the db. Because we now always have at least one (the default one added by a migration), we always get the redirect. Change this so that when the user hits the landing page, we only redirect them to the projects page if there is at least one user-added project and there are no builds. [YOCTO #7932] Signed-off-by: Elliot Smith --- bitbake/lib/toaster/toastergui/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index c583d96..6c73eb4 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -54,7 +54,11 @@ logger = logging.getLogger("toaster") # all new sessions should come through the landing page; # determine in which mode we are running in, and redirect appropriately def landing(request): - if Build.objects.count() == 0 and Project.objects.count() > 0: + # we only redirect to projects page if there is a user-generated project + user_projects = Project.objects.filter(is_default = False) + has_user_project = user_projects.count() > 0 + + if Build.objects.count() == 0 and has_user_project: return redirect(reverse('all-projects'), permanent = False) if Build.objects.all().count() > 0: -- Elliot Smith Software Engineer Intel OTC --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.