fix(passwords): Merge clean location of login related templates (#10340)

DefectDojo · Jun 21, 2024 · 9b05b10 · 9b05b10
1 parent 4c11989
commit 9b05b10
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/...es/notifications/mail/forgot_password.tpl → dojo/templates/login/forgot_password.tpl b/...es/notifications/mail/forgot_password.tpl → dojo/templates/login/forgot_password.tpl
diff --git a/dojo/templates/dojo/forgot_username.html → dojo/templates/login/forgot_username.html b/dojo/templates/dojo/forgot_username.html → dojo/templates/login/forgot_username.html
diff --git a/...es/notifications/mail/forgot_username.tpl → dojo/templates/login/forgot_username.tpl b/...es/notifications/mail/forgot_username.tpl → dojo/templates/login/forgot_username.tpl
diff --git a/.../templates/dojo/forgot_username_done.html → ...templates/login/forgot_username_done.html b/.../templates/dojo/forgot_username_done.html → ...templates/login/forgot_username_done.html
diff --git a/...mplates/dojo/forgot_username_subject.html → ...plates/login/forgot_username_subject.html b/...mplates/dojo/forgot_username_subject.html → ...plates/login/forgot_username_subject.html
diff --git a/dojo/templates/dojo/password_reset.html → dojo/templates/login/password_reset.html b/dojo/templates/dojo/password_reset.html → dojo/templates/login/password_reset.html
diff --git a/...mplates/dojo/password_reset_complete.html → ...plates/login/password_reset_complete.html b/...mplates/dojo/password_reset_complete.html → ...plates/login/password_reset_complete.html
diff --git a/...emplates/dojo/password_reset_confirm.html → ...mplates/login/password_reset_confirm.html b/...emplates/dojo/password_reset_confirm.html → ...mplates/login/password_reset_confirm.html
diff --git a/dojo/templates/dojo/password_reset_done.html → .../templates/login/password_reset_done.html b/dojo/templates/dojo/password_reset_done.html → .../templates/login/password_reset_done.html
diff --git a/dojo/user/urls.py b/dojo/user/urls.py
@@ -30,26 +30,26 @@
 if settings.FORGOT_PASSWORD:
     urlpatterns.extend([
         re_path(r'^password_reset/$', views.DojoPasswordResetView.as_view(
-            template_name='dojo/password_reset.html',
+            template_name='login/password_reset.html',
         ), name="password_reset"),
         re_path(r'^password_reset/done/$', auth_views.PasswordResetDoneView.as_view(
-            template_name='dojo/password_reset_done.html',
+            template_name='login/password_reset_done.html',
         ), name='password_reset_done'),
         re_path(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,40})/$', auth_views.PasswordResetConfirmView.as_view(
-            template_name='dojo/password_reset_confirm.html',
+            template_name='login/password_reset_confirm.html',
         ), name='password_reset_confirm'),
         re_path(r'^reset/done/$', auth_views.PasswordResetCompleteView.as_view(
-            template_name='dojo/password_reset_complete.html',
+            template_name='login/password_reset_complete.html',
         ), name='password_reset_complete'),
     ])
 
 if settings.FORGOT_USERNAME:
     urlpatterns.extend([
         re_path(r'^forgot_username_done/$', auth_views.PasswordResetDoneView.as_view(
-            template_name='dojo/forgot_username_done.html',
+            template_name='login/forgot_username_done.html',
         ), name="forgot_username_done"),
         re_path(r'^forgot_username/$', views.DojoForgotUsernameView.as_view(
-            template_name='dojo/forgot_username.html',
+            template_name='login/forgot_username.html',
             success_url=reverse_lazy("forgot_username_done")
         ), name="forgot_username"),
     ])

diff --git a/dojo/user/views.py b/dojo/user/views.py
@@ -612,8 +612,8 @@ def send_mail(self, subject_template_name, email_template_name,
         from_email = get_system_setting('email_from')
 
         url = hyperlink.parse(settings.SITE_URL)
-        subject_template_name = 'dojo/forgot_username_subject.html'
-        email_template_name = 'notifications/mail/forgot_username.tpl'
+        subject_template_name = 'login/forgot_username_subject.html'
+        email_template_name = 'login/forgot_username.tpl'
         context['site_name'] = url.host
         context['protocol'] = url.scheme
         context['domain'] = settings.SITE_URL[len(f'{url.scheme}://'):]
@@ -638,7 +638,7 @@ def send_mail(self, subject_template_name, email_template_name,
         from_email = get_system_setting('email_from')
 
         url = hyperlink.parse(settings.SITE_URL)
-        email_template_name = 'notifications/mail/forgot_password.tpl'
+        email_template_name = 'login/forgot_password.tpl'
         context['site_name'] = url.host
         context['protocol'] = url.scheme
         context['domain'] = settings.SITE_URL[len(f'{url.scheme}://'):]