From 9f0a825ba66a37428efb178e2c6753c1373e9774 Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Mon, 9 Oct 2017 11:49:30 -0400 Subject: Fix login redirect loop --- app/app/settings.py | 4 ++-- app/dispatch/urls.py | 2 +- app/dispatch/views.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/app/settings.py b/app/app/settings.py index 3b8ffd5..8cc3338 100644 --- a/app/app/settings.py +++ b/app/app/settings.py @@ -123,5 +123,5 @@ USE_TZ = True STATIC_URL = '/static/' -LOGIN_URL = 'login/' -LOGIN_REDIRECT_URL = '/' \ No newline at end of file +LOGIN_URL = '/login/' +LOGIN_REDIRECT_URL = '/' diff --git a/app/dispatch/urls.py b/app/dispatch/urls.py index e735134..9ae41f8 100644 --- a/app/dispatch/urls.py +++ b/app/dispatch/urls.py @@ -7,7 +7,7 @@ from django.contrib.auth import views as authviews urlpatterns = [ url(r'^$', views.home, name='home'), - url(r'^%s$' % settings.LOGIN_URL, authviews.LoginView.as_view(template_name="dispatch/login.html"), name='login'), + url(r'^login/$', authviews.LoginView.as_view(template_name="dispatch/login.html"), name='login'), url(r'^logout/$', authviews.LogoutView.as_view(next_page='/'), name='logout'), url(r'^drivers/$', views.DriverList.as_view(), name='driver_list'), diff --git a/app/dispatch/views.py b/app/dispatch/views.py index 790428c..694b47b 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -198,4 +198,4 @@ class LoadUpdate(FilteredUpdateView): class LoadDelete(FilteredDeleteView): template_name = "dispatch/loads/delete.html" model = Load - success_url = reverse_lazy('load_list') \ No newline at end of file + success_url = reverse_lazy('load_list') -- cgit v1.2.3