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

Merge pull request #3688 from alphagov/display-data-retention-better

Browse Source 
Make custom data retention look a bit nicer
This commit is contained in:
Chris Hill-Scott
2020-10-20 10:34:48 +01:00
committed by GitHub
parent e5de00e0ce 9b7357025c
commit 3735d5d4e1
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,9 +370,19 @@
{{ edit_field('Change', url_for('.service_set_letter_branding', service_id=current_service.id), suffix='letter branding (admin view)') }} {{ edit_field('Change', url_for('.service_set_letter_branding', service_id=current_service.id), suffix='letter branding (admin view)') }}
{% endcall %} {% endcall %}
{% call row() %} {% call row() %}
{{ text_field('Data retention')}} {{ text_field('Custom data retention')}}
{% call field() %} {% call field() %}
{{ current_service.data_retention | join(', ', attribute='notification_type') }} {% for channel in current_service.data_retention %}
{% if loop.first %}
<ul>
{% endif %}
<li>{{ channel.notification_type|format_notification_type }} – {{ channel.days_of_retention }} days</li>
{% if loop.last %}
</ul>
{% endif %}
{% else %}
<div class="table-field-status-default">Not set</div>
{% endfor %}
{% endcall %} {% endcall %}
{{ edit_field('Change', url_for('.data_retention', service_id=current_service.id), suffix='data retention') }} {{ edit_field('Change', url_for('.data_retention', service_id=current_service.id), suffix='data retention') }}
{% endcall %} {% endcall %}

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

@@ -45,7 +45,7 @@
{% for item in current_service.data_retention %} {% for item in current_service.data_retention %}
{% call row() %} {% call row() %}
{{ text_field(item.notification_type | format_notification_type)}} {{ text_field(item.notification_type | format_notification_type)}}
{{ text_field(item.days_of_retention) }} {{ text_field(item.days_of_retention|string + ' days') }}
{{ edit_field('Change', url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=item.id)) }} {{ edit_field('Change', url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=item.id)) }}
{% endcall %} {% endcall %}

4
tests/app/main/views/test_service_settings.py
View File

@@ -104,7 +104,7 @@ def mock_get_service_settings_page_common(
'Free text message allowance 250,000 Change free text message allowance', 'Free text message allowance 250,000 Change free text message allowance',
'Email branding GOV.UK Change email branding (admin view)', 'Email branding GOV.UK Change email branding (admin view)',
'Letter branding Not set Change letter branding (admin view)', 'Letter branding Not set Change letter branding (admin view)',
'Data retention email Change data retention', 'Custom data retention Email – 7 days Change data retention',
'Receive inbound SMS Off Change your settings for Receive inbound SMS', 'Receive inbound SMS Off Change your settings for Receive inbound SMS',
'Email authentication Off Change your settings for Email authentication', 'Email authentication Off Change your settings for Email authentication',
'Send cell broadcasts Off Change your settings for Send cell broadcasts', 'Send cell broadcasts Off Change your settings for Send cell broadcasts',
@@ -5029,7 +5029,7 @@ def test_show_service_data_retention(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
rows = page.select('tbody tr') rows = page.select('tbody tr')
assert len(rows) == 1 assert len(rows) == 1
assert normalize_spaces(rows[0].text) == 'Email 5 Change' assert normalize_spaces(rows[0].text) == 'Email 5 days Change'
def test_view_add_service_data_retention( def test_view_add_service_data_retention(