heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Updates to send email comments, included translation, better validation.

Browse Source
This commit is contained in:
Derek Moore
2012-03-25 22:25:54 -07:00
parent 94e6052375
commit fa72e51689
3 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/edit/forms.py
View File

@@ -61,18 +61,14 @@ class EditProfileForm(wtforms.Form):
class EditAccountForm(wtforms.Form):
old_password = wtforms.PasswordField(
_('Old password'),
[wtforms.validators.Required()],
description=_(
"Enter your old password to prove you own this account."))
new_password = wtforms.PasswordField(
_('New password'),
[wtforms.validators.Required(),
wtforms.validators.Length(min=6, max=30)],
[wtforms.validators.Length(min=6, max=30)],
id="password")
wants_comment_notification = wtforms.BooleanField(
_('Comment notification?'),
[wtforms.validators.Required()],
description=_("Check this box to be emailed when someone else comments on your media."))

72
mediagoblin/edit/views.py
View File

@@ -185,51 +185,51 @@ def edit_profile(request):
@require_active_login
def edit_account(request):
edit_username = request.GET.get('username')
user = request.user
form = forms.EditAccountForm(request.POST,
wants_comment_notification=user.wants_comment_notification)
wants_comment_notification=user.get('wants_comment_notification'))
if request.method == 'POST':
#save status of comment checkbox first, so user does not need to
#change their password as well.
user.wants_comment_notification = request.POST.get(
'wants_comment_notification', False) == u'y'
form_validated = form.validate()
user.save()
#if the user has not filled in the new or old password fields
if not form.new_password.data and not form.old_password.data:
if form.wants_comment_notification.validate(form):
user.wants_comment_notification = \
form.wants_comment_notification.data
user.save()
messages.add_message(request,
messages.SUCCESS,
_("Account settings saved"))
return redirect(request,
'mediagoblin.user_pages.user_home',
user=user.username)
#check remaining fields for validation
if form.validate():
password_matches = auth_lib.bcrypt_check_password(
request.POST['old_password'],
user.pw_hash)
if (request.POST['old_password'] or \
request.POST['new_password']) and not \
password_matches:
form.old_password.errors.append(_('Wrong password'))
return render_to_response(
request,
'mediagoblin/edit/edit_account.html',
{'user': user,
'form': form})
if password_matches:
user.pw_hash = auth_lib.bcrypt_gen_password_hash(
request.POST['new_password'])
user.save()
messages.add_message(request,
messages.SUCCESS,
_("Account settings saved"))
return redirect(request,
'mediagoblin.user_pages.user_home',
user=user.username)
#so the user has filled in one or both of the password fields
else:
if form_validated:
password_matches = auth_lib.bcrypt_check_password(
form.old_password.data,
user.pw_hash)
if password_matches:
#the entire form validates and the password matches
user.pw_hash = auth_lib.bcrypt_gen_password_hash(
form.new_password.data)
user.wants_comment_notification = \
form.wants_comment_notification.data
user.save()
messages.add_message(request,
messages.SUCCESS,
_("Account settings saved"))
return redirect(request,
'mediagoblin.user_pages.user_home',
user=user.username)
else:
form.old_password.errors.append(_('Wrong password'))
return render_to_response(
request,
'mediagoblin/edit/edit_account.html',
{'user': user,
'form': form})