diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index c3d7100f5..6924b74e0 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -419,11 +419,12 @@ def service_edit_email_reply_to(service_id, reply_to_email_id): is_default=True if reply_to_email_address['is_default'] else form.is_default.data ) return redirect(url_for('.service_email_reply_to', service_id=service_id)) + if (request.endpoint == "main.service_confirm_delete_email_reply_to"): + flash("Are you sure you want to delete this email reply-to address?", 'delete') return render_template( 'views/service-settings/email-reply-to/edit.html', form=form, reply_to_email_address_id=reply_to_email_id, - confirm_delete=(request.endpoint == "main.service_confirm_delete_email_reply_to"), ) @@ -687,13 +688,14 @@ def service_edit_sms_sender(service_id, sms_sender_id): return redirect(url_for('.service_sms_senders', service_id=service_id)) form.is_default.data = sms_sender['is_default'] + if (request.endpoint == "main.service_confirm_delete_sms_sender"): + flash("Are you sure you want to delete this text message sender?", 'delete') return render_template( 'views/service-settings/sms-sender/edit.html', form=form, sms_sender=sms_sender, inbound_number=is_inbound_number, - sms_sender_id=sms_sender_id, - confirm_delete=(request.endpoint == "main.service_confirm_delete_sms_sender") + sms_sender_id=sms_sender_id ) diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html index f45c2dd5a..441554c67 100644 --- a/app/templates/views/service-settings/email-reply-to/edit.html +++ b/app/templates/views/service-settings/email-reply-to/edit.html @@ -11,20 +11,9 @@ {% block maincolumn_content %} - {% if confirm_delete %} -
- {% call banner_wrapper(type='dangerous', subhead="Are you sure you want to delete this email reply-to address?") %} -
- - -
- {% endcall %} -
- {% else %} -

- Edit email reply to address -

- {% endif %} +

+ Edit email reply to address +

{% call form_wrapper() %} {{ textbox( form.email_address, diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index 3a82dfbc6..440ecc344 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -11,20 +11,9 @@ {% block maincolumn_content %} - {% if confirm_delete %} -
- {% call banner_wrapper(type='dangerous', subhead="Are you sure you want to delete this text message sender?") %} -
- - -
- {% endcall %} -
- {% else %} -

- Edit text message sender -

- {% endif %} +

+ Edit text message sender +

{% call form_wrapper() %} {% if inbound_number %}

diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 9b6896887..21a258ca9 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -1612,7 +1612,8 @@ def test_confirm_delete_reply_to_email_address( ) assert normalize_spaces(page.select_one('.banner-dangerous').text) == ( - 'Are you sure you want to delete this email reply-to address?' + 'Are you sure you want to delete this email reply-to address? ' + 'Yes, delete' ) assert 'action' not in page.select_one('.banner-dangerous form') assert page.select_one('.banner-dangerous form')['method'] == 'post' @@ -1824,7 +1825,8 @@ def test_confirm_delete_sms_sender( ) assert normalize_spaces(page.select_one('.banner-dangerous').text) == ( - 'Are you sure you want to delete this text message sender?' + 'Are you sure you want to delete this text message sender? ' + 'Yes, delete' ) assert 'action' not in page.select_one('.banner-dangerous form') assert page.select_one('.banner-dangerous form')['method'] == 'post'