Skip to content
Snippets Groups Projects
Commit f9cea933 authored by David Schmitz's avatar David Schmitz
Browse files

fix/false_user_activation_error: stop forcing error message

parent 348724ea
No related branches found
No related tags found
No related merge requests found
...@@ -130,6 +130,7 @@ def activate(request, activation_key): ...@@ -130,6 +130,7 @@ def activate(request, activation_key):
} }
) )
error = None
if account: if account:
# A user has been activated # A user has been activated
email = render_to_string( email = render_to_string(
...@@ -139,7 +140,6 @@ def activate(request, activation_key): ...@@ -139,7 +140,6 @@ def activate(request, activation_key):
'user': account 'user': account
} }
) )
error = None
try: try:
send_mail( send_mail(
_("%sUser account activated") % settings.EMAIL_SUBJECT_PREFIX, _("%sUser account activated") % settings.EMAIL_SUBJECT_PREFIX,
...@@ -149,7 +149,8 @@ def activate(request, activation_key): ...@@ -149,7 +149,8 @@ def activate(request, activation_key):
) )
except SMTPRecipientsRefused as e: except SMTPRecipientsRefused as e:
logger.error("Failed to send a notification e-mail to the user: %s" % e) logger.error("Failed to send a notification e-mail to the user: %s" % e)
error = e #error = e
error = "Failed to send a notification e-mail to the user"
logger.info('Activated account %s' % account) logger.info('Activated account %s' % account)
return render( return render(
...@@ -158,6 +159,6 @@ def activate(request, activation_key): ...@@ -158,6 +159,6 @@ def activate(request, activation_key):
{ {
'account': account, 'account': account,
'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS,
'error': "Failed to send a notification e-mail to the user" 'error': error
}, },
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment