mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 17:45:32 -04:00
Remove platform admin letter/international buttons
Users can choose whether to have these features on or off now. And a platform admin can still use the same controls to switch the features on or off on behalf of a user. There’s no need for the separate buttons.
This commit is contained in:
@@ -253,14 +253,6 @@ def update_service_permissions(service_id, permissions, sms_sender=None):
|
|||||||
service_api_client.update_service_with_properties(service_id, data)
|
service_api_client.update_service_with_properties(service_id, data)
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/service-settings/can-send-letters")
|
|
||||||
@login_required
|
|
||||||
@user_has_permissions(admin_override=True)
|
|
||||||
def service_switch_can_send_letters(service_id):
|
|
||||||
switch_service_permissions(service_id, 'letter')
|
|
||||||
return redirect(url_for('.service_settings', service_id=service_id))
|
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/service-settings/send-letters-as-pdf")
|
@main.route("/services/<service_id>/service-settings/send-letters-as-pdf")
|
||||||
@login_required
|
@login_required
|
||||||
@user_has_permissions(admin_override=True)
|
@user_has_permissions(admin_override=True)
|
||||||
@@ -269,14 +261,6 @@ def service_switch_send_letters_as_pdf(service_id):
|
|||||||
return redirect(url_for('.service_settings', service_id=service_id))
|
return redirect(url_for('.service_settings', service_id=service_id))
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/service-settings/can-send-international-sms")
|
|
||||||
@login_required
|
|
||||||
@user_has_permissions(admin_override=True)
|
|
||||||
def service_switch_can_send_international_sms(service_id):
|
|
||||||
switch_service_permissions(service_id, 'international_sms')
|
|
||||||
return redirect(url_for('.service_settings', service_id=service_id))
|
|
||||||
|
|
||||||
|
|
||||||
@main.route("/services/<service_id>/service-settings/can-send-email")
|
@main.route("/services/<service_id>/service-settings/can-send-email")
|
||||||
@login_required
|
@login_required
|
||||||
@user_has_permissions(admin_override=True)
|
@user_has_permissions(admin_override=True)
|
||||||
|
|||||||
@@ -243,11 +243,6 @@
|
|||||||
{{ 'Stop sending emails' if 'email' in current_service.permissions else 'Allow to send emails' }}
|
{{ 'Stop sending emails' if 'email' in current_service.permissions else 'Allow to send emails' }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="bottom-gutter">
|
|
||||||
<a href="{{ url_for('.service_switch_can_send_letters', service_id=current_service.id) }}" class="button">
|
|
||||||
{{ 'Stop sending letters' if 'letter' in current_service.permissions else 'Allow to send letters' }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% if 'letter' in current_service.permissions %}
|
{% if 'letter' in current_service.permissions %}
|
||||||
<li class="bottom-gutter">
|
<li class="bottom-gutter">
|
||||||
<a href="{{ url_for('.service_switch_send_letters_as_pdf', service_id=current_service.id) }}" class="button">
|
<a href="{{ url_for('.service_switch_send_letters_as_pdf', service_id=current_service.id) }}" class="button">
|
||||||
|
|||||||
@@ -31,9 +31,6 @@ def get_service_settings_page(
|
|||||||
({'permissions': ['email']}, '.service_switch_can_send_email', {}, 'Stop sending emails'),
|
({'permissions': ['email']}, '.service_switch_can_send_email', {}, 'Stop sending emails'),
|
||||||
({'permissions': []}, '.service_switch_can_send_email', {}, 'Allow to send emails'),
|
({'permissions': []}, '.service_switch_can_send_email', {}, 'Allow to send emails'),
|
||||||
|
|
||||||
({'permissions': ['letter']}, '.service_switch_can_send_letters', {}, 'Stop sending letters'),
|
|
||||||
({'permissions': []}, '.service_switch_can_send_letters', {}, 'Allow to send letters'),
|
|
||||||
|
|
||||||
({'permissions': ['sms']}, '.service_switch_can_send_sms', {}, 'Stop sending sms'),
|
({'permissions': ['sms']}, '.service_switch_can_send_sms', {}, 'Stop sending sms'),
|
||||||
({'permissions': []}, '.service_switch_can_send_sms', {}, 'Allow to send sms'),
|
({'permissions': []}, '.service_switch_can_send_sms', {}, 'Allow to send sms'),
|
||||||
|
|
||||||
|
|||||||
@@ -530,8 +530,6 @@ def test_route_permissions(
|
|||||||
'main.service_request_to_go_live',
|
'main.service_request_to_go_live',
|
||||||
'main.service_switch_live',
|
'main.service_switch_live',
|
||||||
'main.service_switch_research_mode',
|
'main.service_switch_research_mode',
|
||||||
'main.service_switch_can_send_letters',
|
|
||||||
'main.service_switch_can_send_international_sms',
|
|
||||||
'main.archive_service',
|
'main.archive_service',
|
||||||
])
|
])
|
||||||
def test_route_invalid_permissions(
|
def test_route_invalid_permissions(
|
||||||
@@ -584,8 +582,6 @@ def test_route_for_platform_admin(
|
|||||||
@pytest.mark.parametrize('route', [
|
@pytest.mark.parametrize('route', [
|
||||||
'main.service_switch_live',
|
'main.service_switch_live',
|
||||||
'main.service_switch_research_mode',
|
'main.service_switch_research_mode',
|
||||||
'main.service_switch_can_send_letters',
|
|
||||||
'main.service_switch_can_send_international_sms',
|
|
||||||
])
|
])
|
||||||
def test_route_for_platform_admin_update_service(
|
def test_route_for_platform_admin_update_service(
|
||||||
mocker,
|
mocker,
|
||||||
|
|||||||
Reference in New Issue
Block a user