From 66c1254beae4d5b4dedad1a59a8e34ba97c05584 Mon Sep 17 00:00:00 2001
From: Dan Braghis <dan.braghis@torchbox.com>
Date: Wed, 10 Jan 2018 10:48:02 +0000
Subject: [PATCH] Clean up post restructure
---
opentech/apply/urls.py | 2 +-
opentech/{ => apply}/users/templates/users/account.html | 0
opentech/{ => apply}/users/templates/users/change_password.html | 0
.../users/templates/users/password_reset/complete.html | 0
.../users/templates/users/password_reset/confirm.html | 0
.../{ => apply}/users/templates/users/password_reset/done.html | 0
.../{ => apply}/users/templates/users/password_reset/email.txt | 0
.../{ => apply}/users/templates/users/password_reset/form.html | 0
opentech/apply/users/urls.py | 2 +-
opentech/apply/users/views.py | 1 +
10 files changed, 3 insertions(+), 2 deletions(-)
rename opentech/{ => apply}/users/templates/users/account.html (100%)
rename opentech/{ => apply}/users/templates/users/change_password.html (100%)
rename opentech/{ => apply}/users/templates/users/password_reset/complete.html (100%)
rename opentech/{ => apply}/users/templates/users/password_reset/confirm.html (100%)
rename opentech/{ => apply}/users/templates/users/password_reset/done.html (100%)
rename opentech/{ => apply}/users/templates/users/password_reset/email.txt (100%)
rename opentech/{ => apply}/users/templates/users/password_reset/form.html (100%)
diff --git a/opentech/apply/urls.py b/opentech/apply/urls.py
index efd6ba373..dc692023f 100644
--- a/opentech/apply/urls.py
+++ b/opentech/apply/urls.py
@@ -5,5 +5,5 @@ from .users import urls as users_urls
urlpatterns = [
url(r'^apply/', include(funds_urls)),
- url(r'^user/', include(users_urls, namespace='users')
+ url(r'^user/', include(users_urls, namespace='users')),
]
diff --git a/opentech/users/templates/users/account.html b/opentech/apply/users/templates/users/account.html
similarity index 100%
rename from opentech/users/templates/users/account.html
rename to opentech/apply/users/templates/users/account.html
diff --git a/opentech/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
similarity index 100%
rename from opentech/users/templates/users/change_password.html
rename to opentech/apply/users/templates/users/change_password.html
diff --git a/opentech/users/templates/users/password_reset/complete.html b/opentech/apply/users/templates/users/password_reset/complete.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/complete.html
rename to opentech/apply/users/templates/users/password_reset/complete.html
diff --git a/opentech/users/templates/users/password_reset/confirm.html b/opentech/apply/users/templates/users/password_reset/confirm.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/confirm.html
rename to opentech/apply/users/templates/users/password_reset/confirm.html
diff --git a/opentech/users/templates/users/password_reset/done.html b/opentech/apply/users/templates/users/password_reset/done.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/done.html
rename to opentech/apply/users/templates/users/password_reset/done.html
diff --git a/opentech/users/templates/users/password_reset/email.txt b/opentech/apply/users/templates/users/password_reset/email.txt
similarity index 100%
rename from opentech/users/templates/users/password_reset/email.txt
rename to opentech/apply/users/templates/users/password_reset/email.txt
diff --git a/opentech/users/templates/users/password_reset/form.html b/opentech/apply/users/templates/users/password_reset/form.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/form.html
rename to opentech/apply/users/templates/users/password_reset/form.html
diff --git a/opentech/apply/users/urls.py b/opentech/apply/users/urls.py
index 76e5050bf..6627da49e 100644
--- a/opentech/apply/users/urls.py
+++ b/opentech/apply/users/urls.py
@@ -6,7 +6,7 @@ from django.urls import reverse_lazy
from wagtail.wagtailadmin.forms import PasswordResetForm
-from opentech.users.views import account
+from opentech.apply.users.views import account
urlpatterns = [
url(r'^$', account, name='account'),
diff --git a/opentech/apply/users/views.py b/opentech/apply/users/views.py
index 4ffcd7a58..4524dd218 100644
--- a/opentech/apply/users/views.py
+++ b/opentech/apply/users/views.py
@@ -3,6 +3,7 @@ from django.shortcuts import render
from wagtail.wagtailadmin.views.account import password_management_enabled
+
@login_required(login_url='/user/login')
def account(request):
"Account page placeholder view"
--
GitLab