heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing up the email verified stuff to reflect the email_verified stuff!

Browse Source 
This commit sponsored by Derek Holdaway.  Thanks!
This commit is contained in:
Christopher Allan Webber 2013-10-08 13:58:02 -05:00
parent fce8e96979
commit 6180e3a915
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mediagoblin/plugins/basic_auth/views.py
View File

@ -68,7 +68,7 @@ def forgot_password(request):
success_message = _("An email has been sent with instructions " success_message = _("An email has been sent with instructions "
"on how to change your password.") "on how to change your password.")
if user and not(user.email_verified and user.status == 'active'): if user and user.has_privilege(u'active') is False:
# Don't send reminder because user is inactive or has no verified email # Don't send reminder because user is inactive or has no verified email
messages.add_message(request, messages.add_message(request,
messages.WARNING, messages.WARNING,
@ -125,8 +125,7 @@ def verify_forgot_password(request):
request, 'index') request, 'index')
# check if user active and has email verified # check if user active and has email verified
if user.email_verified and user.status == 'active': if user.has_privilege(u'active'):
cp_form = forms.ChangeForgotPassForm(formdata_vars) cp_form = forms.ChangeForgotPassForm(formdata_vars)
if request.method == 'POST' and cp_form.validate(): if request.method == 'POST' and cp_form.validate():
@ -145,11 +144,18 @@ def verify_forgot_password(request):
'mediagoblin/plugins/basic_auth/change_fp.html', 'mediagoblin/plugins/basic_auth/change_fp.html',
{'cp_form': cp_form}) {'cp_form': cp_form})
if not user.email_verified: ## Commenting this out temporarily because I'm checking into
messages.add_message( ## what's going on with user.email_verified.
request, messages.ERROR, ##
_('You need to verify your email before you can reset your' ## ... if this commit lasts long enough for anyone but me (cwebber) to
' password.')) ## notice it, they should pester me to remove this or remove it
## themselves ;)
#
# if not user.email_verified:
# messages.add_message(
# request, messages.ERROR,
# _('You need to verify your email before you can reset your'
# ' password.'))
if not user.status == 'active': if not user.status == 'active':
messages.add_message( messages.add_message(