Skip to content

Commit 2fba3ff

Browse files
committed
update
1 parent a17da98 commit 2fba3ff

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

diary_app/forms.py

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django import forms
33
from diary_app.models import Entry, UserData
44
from django.contrib.auth.models import User
5-
from django.contrib.auth.forms import UserCreationForm
5+
from django.contrib.auth.forms import UserCreationForm, PasswordChangeForm
66

77
class EntryForm(ModelForm):
88
class Meta: # Meta class is for attach additional information
@@ -38,4 +38,21 @@ class Meta:
3838

3939
class ContactForm(forms.Form):
4040
sender = forms.EmailField()
41-
message = forms.CharField()
41+
message = forms.CharField()
42+
43+
44+
class PasswordChangeCustomForm(PasswordChangeForm):
45+
error_css_class = 'subtitle'
46+
error_messages = {'password_incorrect':
47+
"message here"}
48+
49+
old_password = CharField(required=False, label='old_password',
50+
widget=PasswordInput(attrs={
51+
'class': 'form-control'}),)
52+
53+
new_password1 = CharField(required=False, label='new_password1',
54+
widget=PasswordInput(attrs={
55+
'class': 'form-control'}),)
56+
new_password2 = CharField(required=False, label='new_password2',
57+
widget=PasswordInput(attrs={
58+
'class': 'form-control'}),)

diary_app/views.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from django.shortcuts import render, redirect
22
from diary_app.models import Entry, UserData
33
from django.contrib.auth.models import User
4-
from diary_app.forms import EntryForm, UserForm, ProfileUpdateForm, ContactForm, UserUpdateForm, UserUpdateForm, NewUserForm
5-
from django.contrib.auth.forms import PasswordChangeForm
4+
from diary_app.forms import EntryForm, UserForm, ProfileUpdateForm, ContactForm, UserUpdateForm, UserUpdateForm, NewUserForm, PasswordChangeCustomForm
5+
#from django.contrib.auth.forms import PasswordChangeForm
66
from django.http import HttpResponse, HttpResponseRedirect
77
from django.shortcuts import get_object_or_404
88
from django.contrib.auth import authenticate, login, logout
@@ -13,7 +13,6 @@
1313
from django.conf import settings
1414
from django.contrib import messages
1515
from django.contrib.auth import update_session_auth_hash
16-
from django.utils.translation import ugettext as _
1716
# importing generic views
1817
from django.views.generic import (
1918
ListView,
@@ -218,7 +217,7 @@ def Profile(request):
218217
if request.method == 'POST':
219218
uform = UserUpdateForm(request.POST, instance=current_user)
220219
puform = ProfileUpdateForm(request.POST, instance=get_bio)
221-
pcform = PasswordChangeForm(request.user, request.POST)
220+
pcform = PasswordChangeCustomForm(request.user, request.POST)
222221

223222
if uform.is_valid() and puform.is_valid() and pcform.is_valid():
224223
puform.save()
@@ -229,6 +228,6 @@ def Profile(request):
229228
else:
230229
uform = UserUpdateForm()
231230
puform = ProfileUpdateForm()
232-
pcform = PasswordChangeForm(request.user)
231+
pcform = PasswordChangeCustomForm(request.user)
233232

234233
return render(request, "users/profile.html", {'uform': uform, 'puform': puform, 'pcform': pcform, 'current_user': current_user, 'get_bio': get_bio})

0 commit comments

Comments
 (0)