mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-05 22:28:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

imrpoved index redirect + fixed tests

Browse Source
This commit is contained in:
vabene1111
2020-04-13 23:11:33 +02:00
parent 0b250c71aa
commit dab77e8e4f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/tests/views/test_views_general.py
View File

@@ -7,10 +7,10 @@ class TestViewsGeneral(TestViews):
def test_index(self): def test_index(self):
r = self.client.get(reverse('index')) r = self.client.get(reverse('index'))
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 302)
r = self.anonymous_client.get(reverse('index')) r = self.anonymous_client.get(reverse('index'))
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 302)
def test_books(self): def test_books(self):
url = reverse('view_books') url = reverse('view_books')

16
cookbook/views/views.py
View File

@@ -20,14 +20,16 @@ from cookbook.tables import RecipeTable
def index(request): def index(request):
if not request.user.is_authenticated: if not request.user.is_authenticated:
return HttpResponseRedirect(reverse_lazy('view_search')) return HttpResponseRedirect(reverse_lazy('view_search'))
try:
page_map = {
UserPreference.SEARCH: reverse_lazy('view_search'),
UserPreference.PLAN: reverse_lazy('view_plan'),
UserPreference.BOOKS: reverse_lazy('view_books'),
}
page_map = { return HttpResponseRedirect(page_map.get(request.user.userpreference.default_page))
UserPreference.SEARCH: reverse_lazy('view_search'), except UserPreference.DoesNotExist:
UserPreference.PLAN: reverse_lazy('view_plan'), return HttpResponseRedirect(reverse_lazy('view_search'))
UserPreference.BOOKS: reverse_lazy('view_books'),
}
return HttpResponseRedirect(page_map.get(request.user.userpreference.default_page))
def search(request): def search(request):