mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 10:28:41 -04:00
Refactor use ServiceOnOffForm
We no longer need a custom form object here – ServiceOnOffForm does the same job of turning strings to booleans and back again.
This commit is contained in:
@@ -1719,16 +1719,6 @@ class ServiceDeliveryStatusCallbackForm(CallbackForm):
|
||||
)
|
||||
|
||||
|
||||
class InternationalSMSForm(StripWhitespaceForm):
|
||||
enabled = RadioField(
|
||||
'Send text messages to international phone numbers',
|
||||
choices=[
|
||||
('on', 'On'),
|
||||
('off', 'Off'),
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
class SMSPrefixForm(StripWhitespaceForm):
|
||||
enabled = RadioField(
|
||||
'',
|
||||
|
||||
@@ -35,7 +35,6 @@ from app.main.forms import (
|
||||
ConfirmPasswordForm,
|
||||
EstimateUsageForm,
|
||||
FreeSMSAllowance,
|
||||
InternationalSMSForm,
|
||||
LinkOrganisationsForm,
|
||||
PreviewBranding,
|
||||
RenameServiceForm,
|
||||
@@ -648,13 +647,14 @@ def service_set_sms_prefix(service_id):
|
||||
@main.route("/services/<uuid:service_id>/service-settings/set-international-sms", methods=['GET', 'POST'])
|
||||
@user_has_permissions('manage_service')
|
||||
def service_set_international_sms(service_id):
|
||||
form = InternationalSMSForm(
|
||||
enabled='on' if current_service.has_permission('international_sms') else 'off'
|
||||
form = ServiceOnOffSettingForm(
|
||||
'Send text messages to international phone numbers',
|
||||
enabled=current_service.has_permission('international_sms'),
|
||||
)
|
||||
if form.validate_on_submit():
|
||||
current_service.force_permission(
|
||||
'international_sms',
|
||||
on=(form.enabled.data == 'on'),
|
||||
on=form.enabled.data,
|
||||
)
|
||||
return redirect(
|
||||
url_for(".service_settings", service_id=service_id)
|
||||
|
||||
@@ -3788,8 +3788,8 @@ def test_broadcast_service_cant_post_to_set_other_channels_endpoint(
|
||||
|
||||
|
||||
@pytest.mark.parametrize('permissions, expected_checked', [
|
||||
(['international_sms'], 'on'),
|
||||
([''], 'off'),
|
||||
(['international_sms'], 'True'),
|
||||
([''], 'False'),
|
||||
])
|
||||
def test_show_international_sms_as_radio_button(
|
||||
client_request,
|
||||
@@ -3812,8 +3812,8 @@ def test_show_international_sms_as_radio_button(
|
||||
|
||||
|
||||
@pytest.mark.parametrize('post_value, international_sms_permission_expected_in_api_call', [
|
||||
('on', True),
|
||||
('off', False),
|
||||
('True', True),
|
||||
('False', False),
|
||||
])
|
||||
def test_switch_service_enable_international_sms(
|
||||
client_request,
|
||||
|
||||
Reference in New Issue
Block a user