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

Merge pull request #3877 from alphagov/no-none-providers

Browse Source 
Stop checking for allowed_broadcast_provider being None
This commit is contained in:
Katie Smith
2021-05-11 16:40:22 +01:00
committed by GitHub
parent 2fba8e02c5 f7036825df
commit 389f98f63c
5 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -2321,7 +2321,7 @@ class ServiceBroadcastAccountTypeField(GovukRadiosField):
if broadcast_channel:
account_type = "live" if live else "training"
account_type += f"-{broadcast_channel}"
if allowed_broadcast_provider and allowed_broadcast_provider != 'all':
if allowed_broadcast_provider != 'all':
account_type += f"-{allowed_broadcast_provider}"
self.data = account_type

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

@@ -435,7 +435,7 @@
Off
{% else %}
{% if current_service.live and current_service.broadcast_channel == "severe" %}Live{% endif %}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider and current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%}
{% if not current_service.live%}Training {% endif%}
{% endif %}
{% endcall %}

2
app/templates/withnav_template.html
View File

@@ -25,7 +25,7 @@
{% else %}
<span class="navigation-service-type navigation-service-type--live">Live
{% endif %}
{% if current_service.allowed_broadcast_provider and current_service.allowed_broadcast_provider != "all" %}
{% if current_service.allowed_broadcast_provider != "all" %}
({{ current_service.allowed_broadcast_provider }})
{% endif %}
</span>