Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

student.views.confirm_email_change: commit/rollback transaction after rendering response instead of before

Browse Source
This commit is contained in:
Usman Khalid
2013-10-15 17:14:52 +05:00
committed by vagrant
parent 6ddd0ae5ab
commit 8f356fc3ec
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/djangoapps/student/views.py
View File

@@ -1315,8 +1315,9 @@ def confirm_email_change(request, key):
try:
pec = PendingEmailChange.objects.get(activation_key=key)
except PendingEmailChange.DoesNotExist:
response = render_to_response("invalid_email_key.html", {})
transaction.rollback()
return render_to_response("invalid_email_key.html", {})
return response
user = pec.user
address_context = {
@@ -1325,8 +1326,9 @@ def confirm_email_change(request, key):
}
if len(User.objects.filter(email=pec.new_email)) != 0:
response = render_to_response("email_exists.html", {})
transaction.rollback()
return render_to_response("email_exists.html", {})
return response
subject = render_to_string('emails/email_change_subject.txt', address_context)
subject = ''.join(subject.splitlines())
@@ -1342,9 +1344,10 @@ def confirm_email_change(request, key):
try:
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
except Exception:
transaction.rollback()
log.warning('Unable to send confirmation email to old address', exc_info=True)
return render_to_response("email_change_failed.html", {'email': user.email})
response = render_to_response("email_change_failed.html", {'email': user.email})
transaction.rollback()
return response
user.email = pec.new_email
user.save()
@@ -1353,12 +1356,14 @@ def confirm_email_change(request, key):
try:
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
except Exception:
transaction.rollback()
log.warning('Unable to send confirmation email to new address', exc_info=True)
return render_to_response("email_change_failed.html", {'email': pec.new_email})
response = render_to_response("email_change_failed.html", {'email': pec.new_email})
transaction.rollback()
return response
response = render_to_response("email_change_successful.html", address_context)
transaction.commit()
return render_to_response("email_change_successful.html", address_context)
return response
except Exception:
# If we get an unexpected exception, be sure to rollback the transaction
transaction.rollback()