darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 00:07:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3389 from alphagov/fix-unhandled-errpr

Browse Source 
Fix bug where adding same reply-to-email twice for the same service caused a 5xx
This commit is contained in:
Pea M. Tyczynska
2020-03-31 14:08:02 +01:00
committed by GitHub
parent f7f31de2e7 ebe2c1c4ae
commit 2bb47af3c3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/service_settings.py
View File

@@ -391,9 +391,8 @@ def service_add_email_reply_to(service_id):
service_id, form.email_address.data service_id, form.email_address.data
)["data"]["id"] )["data"]["id"]
except HTTPError as e: except HTTPError as e:
error_msg = "Your service already uses '{}' as an email reply-to address.".format(form.email_address.data) if e.status_code == 409 or e.status_code == 400:
if e.status_code == 400 and error_msg == e.message: flash(e.message, 'error')
flash(error_msg, 'error')
return redirect(url_for('.service_email_reply_to', service_id=service_id)) return redirect(url_for('.service_email_reply_to', service_id=service_id))
else: else:
raise e raise e
@@ -519,9 +518,8 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
service_id, form.email_address.data service_id, form.email_address.data
)["data"]["id"] )["data"]["id"]
except HTTPError as e: except HTTPError as e:
error_msg = "Your service already uses ‘{}’ as a reply-to email address.".format(form.email_address.data) if e.status_code == 400 or e.status_code == 409:
if e.status_code == 400 and error_msg == e.message: flash(e.message, 'error')
flash(error_msg, 'error')
return redirect(url_for('.service_email_reply_to', service_id=service_id)) return redirect(url_for('.service_email_reply_to', service_id=service_id))
else: else:
raise e raise e