user password reset fix

circle/circle/settings/base.py

@@ -348,7 +348,7 @@ DJANGO_APPS = (
     'django.contrib.auth',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sessions',
-    #'django.contrib.sites',
+#    'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.staticfiles',
 
 

circle/circle/urls.py

@@ -23,10 +23,9 @@ from django.contrib import admin
 from django.urls import reverse
 from django.urls import reverse
 from django.shortcuts import redirect
 from django.shortcuts import redirect
 from django.contrib.auth.views import (
 from django.contrib.auth.views import (
-    PasswordResetView
+    PasswordResetView, PasswordResetConfirmView
 )
 )
 
 
-
 from circle.settings.base import get_env_variable
 from circle.settings.base import get_env_variable
 from dashboard.views import (
 from dashboard.views import (
     CircleLoginView, HelpView, ResizeHelpView, TwoFactorLoginView
     CircleLoginView, HelpView, ResizeHelpView, TwoFactorLoginView
@@ -47,12 +46,10 @@ urlpatterns = [
     # django/contrib/auth/urls.py (care when new version)
     # django/contrib/auth/urls.py (care when new version)
     url((r'^accounts/reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
     url((r'^accounts/reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
          r'(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$'),
          r'(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$'),
-        PasswordResetView,
-        {'set_password_form': CircleSetPasswordForm},
-        name='accounts.PasswordResetView'
+        PasswordResetConfirmView.as_view(form_class=CircleSetPasswordForm),
+        name='accounts.password_reset_confirm'
         ),
         ),
-    url(r'^accounts/password/reset/$', PasswordResetView,
-        {'password_reset_form': CirclePasswordResetForm},
+    url(r'^accounts/password/reset/$', PasswordResetView.as_view(form_class=CirclePasswordResetForm),
         name="accounts.password-reset",
         name="accounts.password-reset",
         ),
         ),
     url(r'^accounts/login/?$', CircleLoginView.as_view(),
     url(r'^accounts/login/?$', CircleLoginView.as_view(),