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

Remove some of the option we have for broadcast services.

Browse Source 
This is the first step in making the UI easier for setting the
options for a broadcast service. Here we remove the options for
"Training mode" test channels. When we create a broadcast message for a trail mode service it is marked as stubbed and does not create a broadcast event that is sent to a provider.

The label for the form and setting page have been updated to reflect the
change.
This commit is contained in:
Rebecca Law
2021-05-04 15:58:57 +01:00
parent bfc55b45ca
commit 5495de0b3b
3 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/forms.py
View File

@@ -2342,17 +2342,13 @@ class ServiceBroadcastAccountTypeForm(StripWhitespaceForm):
'Change cell broadcast service type',
thing='which type of account this cell broadcast service is',
choices=[
("training-test-ee", "Training mode - EE network - Test channel only"),
("training-test-o2", "Training mode - O2 network - Test channel only"),
("training-test-three", "Training mode - Three network - Test channel only"),
("training-test-vodafone", "Training mode - Vodafone network - Test channel only"),
("training-severe", "Training mode - All networks - Public channel"),
("live-test-ee", "Live - EE network - Test channel only"),
("live-test-o2", "Live - O2 network - Test channel only"),
("live-test-three", "Live - Three network - Test channel only"),
("live-test-vodafone", "Live - Vodafone network - Test channel only"),
("live-test", "Live - All networks - Test channel only"),
("live-severe", "Live - All networks - Public channel"),
("training-test", "Training mode"),
("live-test-ee", "Test channel (EE)"),
("live-test-o2", "Test channel (O2)"),
("live-test-three", "Test channel (Three)"),
("live-test-vodafone", "Test channel (Vodafone)"),
("live-test", "Test channel (all networks)"),
("live-severe", "Live (all networks)"),
],
validators=[DataRequired()]
)

4
app/templates/views/service-settings.html
View File

@@ -434,7 +434,9 @@
{% if not current_service.broadcast_channel %}
Off
{% else %}
{% if current_service.live %}Live{% else %}Training mode{% endif %} - {% if current_service.allowed_broadcast_provider %}{{ current_service.allowed_broadcast_provider|format_mobile_network }} network{% else %}All networks{% endif %} - {% if current_service.broadcast_channel == "test" %}Test channel only{% else %}Public channel{% endif %}
{% if current_service.live and current_service.broadcast_channel == "severe" %}Live - Public channel{% endif %}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test channel {% if current_service.allowed_broadcast_provider %}({{ current_service.allowed_broadcast_provider|format_mobile_network }} network){% else %} (All networks){% endif %}{%endif%}
{% if not current_service.live%}Training mode {% endif%}
{% endif %}
{% endcall %}
{{ edit_field(