update

Author: thecoducer

diary_app/forms.py

@@ -39,13 +39,3 @@ class Meta:
 class ContactForm(forms.Form):
     sender = forms.EmailField()
     message = forms.CharField()
-
-
-class PasswordChangeCustomForm(PasswordChangeForm):
-        error_css_class = 'subtitle'
-        error_messages = {'password_incorrect':
-                  "message here"}
-
-        old_password = forms.CharField(required=False, label='old_password')
-        new_password1 = forms.CharField(required=False, label='new_password1')
-        new_password2 = forms.CharField(required=False, label='new_password2')

diary_app/views.py

@@ -1,8 +1,8 @@
 from django.shortcuts import render, redirect
 from diary_app.models import Entry, UserData
 from django.contrib.auth.models import User
-from diary_app.forms import EntryForm, UserForm, ProfileUpdateForm, ContactForm, UserUpdateForm, UserUpdateForm, NewUserForm, PasswordChangeCustomForm
-#from django.contrib.auth.forms import PasswordChangeForm
+from diary_app.forms import EntryForm, UserForm, ProfileUpdateForm, ContactForm, UserUpdateForm, UserUpdateForm, NewUserForm
+from django.contrib.auth.forms import PasswordChangeForm
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.contrib.auth import authenticate, login, logout
@@ -179,7 +179,7 @@ def SocialSignUp(request):
                         form = NewUserForm(request.POST, instance=new_user)
                         if form.is_valid():
                                 form.save()
-                                return redirect('home')
+                                return redirect(self.request.GET.get('next'))
                 else:
                         form = NewUserForm()
                 return render(request, 'users/social-signup.html', {'form': form, 'new_user': new_user})
@@ -217,7 +217,7 @@ def Profile(request):
                 if request.method == 'POST':
                         uform = UserUpdateForm(request.POST, instance=current_user)
                         puform = ProfileUpdateForm(request.POST, instance=get_bio)
-                        pcform = PasswordChangeCustomForm(request.user, request.POST)
+                        pcform = PasswordChangeForm(request.user, request.POST)
 
                         if uform.is_valid() and puform.is_valid() and pcform.is_valid():
                                 puform.save()
@@ -228,6 +228,6 @@ def Profile(request):
                 else:
                         uform = UserUpdateForm()
                         puform = ProfileUpdateForm()
-                        pcform = PasswordChangeCustomForm(request.user)
+                        pcform = PasswordChangeForm(request.user)
 
                 return render(request, "users/profile.html", {'uform': uform, 'puform': puform, 'pcform': pcform, 'current_user': current_user, 'get_bio': get_bio})

diary_proj/settings.py

@@ -186,7 +186,7 @@
     'social_core.pipeline.social_auth.associate_by_email',
 )
 
-SOCIAL_AUTH_NEW_USER_REDIRECT_URL = '/social-signup/'
+SOCIAL_AUTH_NEW_USER_REDIRECT_URL = '/social-signup/?next=/'
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.gmail.com'