From 4635df09a8611c8ed47240fdfbacdb4637f23226 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 13 Feb 2017 08:35:10 +0100 Subject: [PATCH 1/4] redoing user password forgot functionality --- rowers/templates/base.html | 2 +- rowers/templates/registration/login.html | 6 +++++- rowsandall_app/settings.py | 6 +++--- rowsandall_app/urls.py | 25 +++++++++++++++--------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/rowers/templates/base.html b/rowers/templates/base.html index 48b6fde5..061b6252 100644 --- a/rowers/templates/base.html +++ b/rowers/templates/base.html @@ -38,7 +38,7 @@ {% if user.is_authenticated %}

Password Change

{% else %} -

Forgotten Password?

+

Forgot Password?

{% endif %} diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html index f37b61a4..41550cc7 100644 --- a/rowers/templates/registration/login.html +++ b/rowers/templates/registration/login.html @@ -17,10 +17,14 @@ {{ form.password.label_tag }} {{ form.password }} + + + Forgot password? + -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 02751a8a..b71ea960 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -39,15 +39,15 @@ ALLOWED_HOSTS = CFG['allowed_hosts'] # Application definition INSTALLED_APPS = [ + 'rowers', + 'cvkbrno', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'rowers', - 'cvkbrno', - 'django_rq', + 'django_rq', 'django_rq_dashboard', 'translation_manager', # 'debug_toolbar', diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index 8d589ee1..92371cd4 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -21,21 +21,28 @@ from rowsandall_app.views import rootview from django.contrib.auth import views as auth_views from rowers import views as rowersviews - urlpatterns = [ + url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), + url(r'^password_change/$',auth_views.password_change), + url(r'^password_reset/$', auth_views.password_reset, name='password_reset'), + url(r'^password_reset/done/$', auth_views.password_reset_done,name='password_reset_done'), + url(r'^reset/(?P[0-9A-Za-z_\-]+)-(?P.+)/$', auth_views.password_reset_confirm), + url(r'^reset/done/$', auth_views.password_reset_complete, + name='password_reset_complete'), + ] + +urlpatterns += [ url(r'^admin/', admin.site.urls), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^$',rootview), url(r'^login/',auth_views.login, name='login'), url(r'^logout/',auth_views.logout_then_login,name='logout'), - url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), - url(r'^password_change/',auth_views.password_change), - url(r'^password_reset/$',auth_views.password_reset,name='password_reset'), - url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'), - url(r'^password_reset_confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'), - url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'), - url(r'^password_reset_complete/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'), - url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'), +# url(r'^password_reset/$',auth_views.password_reset,name='password_reset'), +# url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'), +# url(r'^password_reset_confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'), +# url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'), +# url(r'^password_reset_complete/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'), +# url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'), url(r'^rowers/',include('rowers.urls')), url(r'^cvkbrno/',include('cvkbrno.urls')), url(r'^admin/rq/',include('django_rq_dashboard.urls')), From cba50bdab20c0cc2c3685211d600179b7b30501a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 13 Feb 2017 08:59:27 +0100 Subject: [PATCH 2/4] trying to bugfix passwrod reset --- rowsandall_app/urls.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index 92371cd4..b10ad729 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -24,9 +24,15 @@ from rowers import views as rowersviews urlpatterns = [ url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), url(r'^password_change/$',auth_views.password_change), - url(r'^password_reset/$', auth_views.password_reset, name='password_reset'), - url(r'^password_reset/done/$', auth_views.password_reset_done,name='password_reset_done'), - url(r'^reset/(?P[0-9A-Za-z_\-]+)-(?P.+)/$', auth_views.password_reset_confirm), + url(r'^password_reset/$', + auth_views.password_reset, + name='password_reset'), + url(r'^password_reset/done/$', + auth_views.password_reset_done, + name='password_reset_done'), + url(r'^reset/(?P[0-9A-Za-z_\-]+)-(?P.+)/$', + auth_views.password_reset_confirm, + name='password_reset_confirm'), url(r'^reset/done/$', auth_views.password_reset_complete, name='password_reset_complete'), ] From 64fb109676abd95f3c53e118aa063078f259abe7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 13 Feb 2017 09:55:33 +0100 Subject: [PATCH 3/4] added admins for bug reporting --- rowsandall_app/settings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index b71ea960..25691ef2 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -250,6 +250,11 @@ RQ_QUEUES = { #SESSION_ENGINE = "django.contrib.sessions.backends.cached_db" SESSION_ENGINE = "django.contrib.sessions.backends.cache" +# admin stuff for error reporting +SERVER_EMAIL='admin@rowsandall.com' +ADMINS = [('Sander','roosendaalsander@gmail.com')] + + # email stuff EMAIL_BACKEND = CFG['email_backend'] From 2ed59add2e41a5ba79018c91090be01036cdef57 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 13 Feb 2017 11:18:35 +0100 Subject: [PATCH 4/4] set default from address --- rowsandall_app/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 25691ef2..6f61935d 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -267,7 +267,7 @@ EMAIL_HOST_USER = CFG['email_host_user'] EMAIL_HOST_PASSWORD = CFG['email_host_password'] EMAIL_USE_TLS = CFG['email_use_tls'] #EMAIL_USE_TLS = False - +DEFAULT_FROM_EMAIL = 'admin@rowsandall.com' # weather stuff