From 9f71991c0230639ba2821c30ecbcd9465074b6b5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 22 Mar 2019 14:51:10 +0100 Subject: [PATCH] still login page not working --- rowers/templatetags/rowerfilters.py | 2 +- rowers/tests/statements.py | 2 +- rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes rowsandall_app/settings.py | 2 -- rowsandall_app/urls.py | 5 +++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 968814d6..0f747488 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -88,7 +88,7 @@ def secondstotimestring(tdelta): @register.filter def existing_customer(user): - if user.is_anonymous(): + if user.is_anonymous: return False else: return payments.is_existing_customer(user.rower) diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index 9642bb30..0276fe67 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -53,7 +53,7 @@ from mock import Mock, patch import pandas as pd import rowers.c2stuff as c2stuff -from django.core.urlresolvers import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy import json import numpy as np diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index d4f961aa31a6f798f4dc7fca7fcfd5e60ca882ee..33d306dc962837193803d72f3669eda36e856212 100644 GIT binary patch delta 16 XcmaEz_&SkYzMF$X@5Pjj>`x2;JUj-_ delta 16 YcmaEz_&SkYzMF&N%g4zZ*`F8y072IWo&W#< diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index e4f32a32..a9eb736c 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -81,7 +81,6 @@ AUTHENTICATION_BACKENDS = ( ) MIDDLEWARE = [ -# 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.common.BrokenLinkEmailsMiddleware', 'django.middleware.gzip.GZipMiddleware', @@ -96,7 +95,6 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'oauth2_provider.middleware.OAuth2TokenMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', -# 'async_messages.middleware.AsyncMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'tz_detect.middleware.TimezoneMiddleware', 'rowers.middleware.GDPRMiddleWare', diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index fd484e20..693f91ab 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -63,8 +63,9 @@ urlpatterns += [ re_path(r'^$',rootview), re_path(r'^getblogs/$',rowersviews.get_blog_posts), re_path(r'^login/', - auth_views.LoginView, - name='login'), +# auth_views.LoginView, + auth_views.LoginView, + name='login'), re_path(r'^logout/$', auth_views.LogoutView, {'next_page': '/'},