diff --git a/server/core/urls.py b/server/core/urls.py index ef247798..a1ae1a84 100644 --- a/server/core/urls.py +++ b/server/core/urls.py @@ -8,8 +8,7 @@ from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls from core import views -from core.views import LegacySetPasswordView, LegacySetPasswordDoneView, LegacySetPasswordConfirmView,\ - LegacySetPasswordCompleteView, SetPasswordView, SetPasswordDoneView, SetPasswordConfirmView, SetPasswordCompleteView + urlpatterns = [ # django admin @@ -17,21 +16,6 @@ urlpatterns = [ url(r'^accounts/', include('django.contrib.auth.urls')), url(r'^statistics/', include('statistics.urls', namespace='statistics')), - # legacy - will be removed - # set password - path('welcome/', LegacySetPasswordView.as_view(), name='set_password'), - path('set-password/done/', LegacySetPasswordDoneView.as_view(), name='set_password_done'), - path('set-password///', LegacySetPasswordConfirmView.as_view(), name='set_password_confirm'), - path('set-password/complete/', LegacySetPasswordCompleteView.as_view(), name='set_password_complete'), - - # set password upon registration - path('registration/welcome/', SetPasswordView.as_view(), name='registration_set_password'), - path('registration/set-password/done/', SetPasswordDoneView.as_view(), name='registration_set_password_done'), - path('registration/set-password///', SetPasswordConfirmView.as_view(), - name='registration_set_password_confirm'), - path('registration/set-password/complete/', SetPasswordCompleteView.as_view(), - name='registration_set_password_complete'), - # wagtail url(r'^cms/', include(wagtailadmin_urls)), diff --git a/server/core/views.py b/server/core/views.py index d1a22ee3..bf84cb84 100644 --- a/server/core/views.py +++ b/server/core/views.py @@ -30,55 +30,6 @@ def home(request): return render(request, 'index.html', {}) -class SetPasswordView(PasswordResetView): - email_template_name = 'registration/registration_set_password_email.html' - subject_template_name = 'registration/registration_set_password_subject.txt' - success_url = reverse_lazy('registration_set_password_done') - template_name = 'registration/registration_set_password_form.html' - title = _('Password setzen') - - -class SetPasswordDoneView(PasswordResetDoneView): - template_name = 'registration/registration_set_password_done.html' - title = _('Password setzen versandt') - - -class SetPasswordConfirmView(PasswordResetConfirmView): - success_url = reverse_lazy('registration_set_password_complete') - template_name = 'registration/registration_set_password_confirm.html' - title = _('Gib ein Passwort ein') - - -class SetPasswordCompleteView(PasswordResetCompleteView): - template_name = 'registration/registration_set_password_complete.html' - title = _('Passwort setzen erfolgreich') - - -# legacy -class LegacySetPasswordView(PasswordResetView): - email_template_name = 'registration/set_password_email.html' - subject_template_name = 'registration/set_password_subject.txt' - success_url = reverse_lazy('set_password_done') - template_name = 'registration/set_password_form.html' - title = _('Password setzen') - - -class LegacySetPasswordDoneView(PasswordResetDoneView): - template_name = 'registration/set_password_done.html' - title = _('Password setzen versandt') - - -class LegacySetPasswordConfirmView(PasswordResetConfirmView): - success_url = reverse_lazy('set_password_complete') - template_name = 'registration/set_password_confirm.html' - title = _('Gib ein Passwort ein') - - -class LegacySetPasswordCompleteView(PasswordResetCompleteView): - template_name = 'registration/set_password_complete.html' - title = _('Passwort setzen erfolgreich') - - class ConfirmationKeyDisplayView(TemplateView): template_name = 'confirmation_key.html'