steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Do not deal with child count during root redirect.

This commit is contained in:
Christopher Charbonneau Wells 2018-05-20 08:54:28 -07:00
parent 0a5ffed012
commit ab2717ed56
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
babybuddy/tests/tests_views.py
View File

@ -6,8 +6,6 @@ from django.core.management import call_command
from faker import Factory from faker import Factory
from core.models import Child
class ViewsTestCase(TestCase): class ViewsTestCase(TestCase):
@classmethod @classmethod
@ -29,20 +27,6 @@ class ViewsTestCase(TestCase):
cls.c.login(**cls.credentials) cls.c.login(**cls.credentials)
def test_root_router(self): def test_root_router(self):
page = self.c.get('/')
self.assertEqual(page.url, '/welcome/')
call_command('fake', verbosity=0, children=1, days=1)
child = Child.objects.first()
page = self.c.get('/')
self.assertEqual(
page.url, '/children/{}/dashboard/'.format(child.slug))
Child.objects.create(
first_name='Second',
last_name='Child',
birth_date='2000-01-01'
)
page = self.c.get('/') page = self.c.get('/')
self.assertEqual(page.url, '/dashboard/') self.assertEqual(page.url, '/dashboard/')

11
babybuddy/views.py
View File

@ -26,16 +26,7 @@ class RootRouter(LoginRequiredMixin, RedirectView):
more than one child is in the database. more than one child is in the database.
""" """
def get_redirect_url(self, *args, **kwargs): def get_redirect_url(self, *args, **kwargs):
children = models.Child.objects.count() self.url = reverse('dashboard:dashboard')
if children == 0:
self.url = reverse('babybuddy:welcome')
elif children == 1:
self.url = reverse(
'dashboard:dashboard-child',
args={models.Child.objects.first().slug}
)
else:
self.url = reverse('dashboard:dashboard')
return super(RootRouter, self).get_redirect_url(self, *args, **kwargs) return super(RootRouter, self).get_redirect_url(self, *args, **kwargs)