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

Replace ‘broadcast’ with ‘alert’ on dashboard

Browse Source 
We’re moving away from ‘broadcast’ as a noun, so this commit updates the
dashboard to be in line with changes in other PRs.
This commit is contained in:
Chris Hill-Scott
2020-08-24 12:04:06 +01:00
parent 0dfbc1df67
commit 6131f6c6aa
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/broadcast.py
View File

@@ -53,17 +53,17 @@ def get_broadcast_dashboard_partials(service_id):
pending_approval_broadcasts=render_template( pending_approval_broadcasts=render_template(
'views/broadcast/partials/dashboard-table.html', 'views/broadcast/partials/dashboard-table.html',
broadcasts=broadcast_messages.with_status('pending-approval'), broadcasts=broadcast_messages.with_status('pending-approval'),
empty_message='You do not have any broadcasts waiting for approval', empty_message='You do not have any alerts waiting for approval',
), ),
live_broadcasts=render_template( live_broadcasts=render_template(
'views/broadcast/partials/dashboard-table.html', 'views/broadcast/partials/dashboard-table.html',
broadcasts=broadcast_messages.with_status('broadcasting'), broadcasts=broadcast_messages.with_status('broadcasting'),
empty_message='You do not have any live broadcasts at the moment', empty_message='You do not have any live alerts at the moment',
), ),
previous_broadcasts=render_template( previous_broadcasts=render_template(
'views/broadcast/partials/dashboard-table.html', 'views/broadcast/partials/dashboard-table.html',
broadcasts=broadcast_messages.with_status('cancelled', 'completed'), broadcasts=broadcast_messages.with_status('cancelled', 'completed'),
empty_message='You do not have any previous broadcasts', empty_message='You do not have any previous alerts',
), ),
) )

4
app/templates/views/broadcast/dashboard.html
View File

@@ -18,7 +18,7 @@
</nav> </nav>
{% endif %} {% endif %}
<h2 class="heading-medium govuk-!-margin-bottom-2">Live broadcasts</h2> <h2 class="heading-medium govuk-!-margin-bottom-2">Live alerts</h2>
{{ ajax_block( {{ ajax_block(
partials, partials,
@@ -34,7 +34,7 @@
'pending_approval_broadcasts' 'pending_approval_broadcasts'
) }} ) }}
<h2 class="heading-medium govuk-!-margin-bottom-2">Previous broadcasts</h2> <h2 class="heading-medium govuk-!-margin-bottom-2">Previous alerts</h2>
{{ ajax_block( {{ ajax_block(
partials, partials,

10
tests/app/main/views/test_broadcast.py
View File

@@ -164,9 +164,9 @@ def test_empty_broadcast_dashboard(
assert [ assert [
normalize_spaces(row.text) for row in page.select('tbody tr .table-empty-message') normalize_spaces(row.text) for row in page.select('tbody tr .table-empty-message')
] == [ ] == [
'You do not have any live broadcasts at the moment', 'You do not have any live alerts at the moment',
'You do not have any broadcasts waiting for approval', 'You do not have any alerts waiting for approval',
'You do not have any previous broadcasts', 'You do not have any previous alerts',
] ]
@@ -184,7 +184,7 @@ def test_broadcast_dashboard(
) )
assert normalize_spaces(page.select('main h2')[0].text) == ( assert normalize_spaces(page.select('main h2')[0].text) == (
'Live broadcasts' 'Live alerts'
) )
assert [ assert [
normalize_spaces(row.text) for row in page.select('table')[0].select('tbody tr') normalize_spaces(row.text) for row in page.select('table')[0].select('tbody tr')
@@ -202,7 +202,7 @@ def test_broadcast_dashboard(
] ]
assert normalize_spaces(page.select('main h2')[2].text) == ( assert normalize_spaces(page.select('main h2')[2].text) == (
'Previous broadcasts' 'Previous alerts'
) )
assert [ assert [
normalize_spaces(row.text) for row in page.select('table')[2].select('tbody tr') normalize_spaces(row.text) for row in page.select('table')[2].select('tbody tr')