From c9a05be1ffdabb454ee04a905bc6de6f7e3fcc47 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Wed, 2 Sep 2015 17:25:09 -0700 Subject: bitbake: toaster: Only redirect to projects page if user has added projects 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] (Bitbake rev: 316a70da93055b63eff7d40b7fd8bd07299074af) Signed-off-by: Elliot Smith Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index c583d9613a..6c73eb4c50 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: -- cgit v1.2.3-54-g00ecf