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

Remove reference to end time for approver

Browse Source 
Messages awaiting approval don’t have an end time – it’s set
automatically once the message is approved.

We need to revisit the content on this page, but this is just a fix so
that the page doesn’t `500`.
This commit is contained in:
Chris Hill-Scott
2020-08-20 10:08:33 +01:00
parent f5a664276a
commit 33688b92c5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/broadcast/view-message.html
View File

@@ -30,7 +30,7 @@
{% call form_wrapper(class="banner govuk-!-margin-bottom-6") %} {% call form_wrapper(class="banner govuk-!-margin-bottom-6") %}
<p class="govuk-body govuk-!-margin-top-0 govuk-!-margin-bottom-3"> <p class="govuk-body govuk-!-margin-top-0 govuk-!-margin-bottom-3">
{{ broadcast_message.created_by.name }} wants to broadcast this {{ broadcast_message.created_by.name }} wants to broadcast this
message until {{ broadcast_message.finishes_at|format_datetime_relative }}. message.
</p> </p>
{{ page_footer( {{ page_footer(
"Start broadcasting now", "Start broadcasting now",

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

@@ -687,7 +687,7 @@ def test_view_pending_broadcast(
service_id=SERVICE_ONE_ID, service_id=SERVICE_ONE_ID,
template_id=fake_uuid, template_id=fake_uuid,
created_by_id=fake_uuid, created_by_id=fake_uuid,
finishes_at='2020-02-23T23:23:23.000000', finishes_at=None,
status='pending-approval', status='pending-approval',
), ),
) )
@@ -706,7 +706,7 @@ def test_view_pending_broadcast(
assert ( assert (
normalize_spaces(page.select_one('.banner').text) normalize_spaces(page.select_one('.banner').text)
) == ( ) == (
'Test User wants to broadcast this message until tomorrow at 11:23pm. ' 'Test User wants to broadcast this message. '
'Start broadcasting now Reject this broadcast' 'Start broadcasting now Reject this broadcast'
) )