Let users without send_messages view broadcasts

At the moment viewing a broadcast is limited to those users who have
the `send_messages` permission.

This doesn’t match how we describe the permissions on the team members
page

This commit makes it so that any team member can see a broadcast that’s
in any state other than `draft`.
This commit is contained in:
Chris Hill-Scott
2020-08-10 12:13:11 +01:00
parent 38953d1c28
commit 78c88530b5
3 changed files with 54 additions and 3 deletions

View File

@@ -182,7 +182,7 @@ def preview_broadcast_message(service_id, broadcast_message_id):
@main.route('/services/<uuid:service_id>/broadcast/<uuid:broadcast_message_id>')
@user_has_permissions('send_messages')
@user_has_permissions()
@service_has_permission('broadcast')
def view_broadcast_message(service_id, broadcast_message_id):
broadcast_message = BroadcastMessage.from_id(

View File

@@ -18,7 +18,7 @@
) }}
{% if broadcast_message.status == 'pending-approval' %}
{% if broadcast_message.created_by == current_user %}
{% if broadcast_message.created_by == current_user and current_user.has_permissions('send_messages') %}
<div class="banner govuk-!-margin-bottom-6">
<h2 class="govuk-heading-s govuk-!-margin-bottom-3">Your broadcast is waiting for approval from another member of your team</h2>
<p class="govuk-body">Once approved it will be live until
@@ -29,7 +29,7 @@
delete_link_text='Withdraw this broadcast'
) }}
</div>
{% else %}
{% elif current_user.has_permissions('send_messages') %}
{% call form_wrapper(class="banner govuk-!-margin-bottom-6") %}
<p class="govuk-body govuk-!-margin-top-0 govuk-!-margin-bottom-3">
{{ broadcast_message.created_by.name }} wants to broadcast this
@@ -41,6 +41,13 @@
delete_link_text='Reject this broadcast'
) }}
{% endcall %}
{% else %}
<div class="banner govuk-!-margin-bottom-6">
<h2 class="govuk-heading-s govuk-!-margin-bottom-3">This broadcast is waiting for approval</h2>
<p class="govuk-body">
You dont have permission to approve broadcasts.
</p>
</div>
{% endif %}
{% else %}
<p class="govuk-body govuk-!-margin-bottom-3">

View File

@@ -639,6 +639,50 @@ def test_cant_approve_own_broadcast(
)
@freeze_time('2020-02-22T22:22:22.000000')
def test_view_only_user_cant_approve_broadcast(
mocker,
client_request,
service_one,
active_user_with_permissions,
active_user_view_permissions,
mock_get_broadcast_template,
fake_uuid,
):
mocker.patch(
'app.broadcast_message_api_client.get_broadcast_message',
return_value=broadcast_message_json(
id_=fake_uuid,
service_id=SERVICE_ONE_ID,
template_id=fake_uuid,
created_by_id=fake_uuid,
finishes_at='2020-02-23T23:23:23.000000',
status='pending-approval',
),
)
mocker.patch('app.user_api_client.get_user', side_effect=[
active_user_view_permissions, # Current user
active_user_with_permissions, # User who created broadcast
])
service_one['permissions'] += ['broadcast']
page = client_request.get(
'.view_broadcast_message',
service_id=SERVICE_ONE_ID,
broadcast_message_id=fake_uuid,
)
assert (
normalize_spaces(page.select_one('.banner').text)
) == (
'This broadcast is waiting for approval '
'You dont have permission to approve broadcasts.'
)
assert not page.select_one('form')
assert not page.select_one('.banner a')
@pytest.mark.parametrize('initial_status, expected_approval', (
('draft', False,),
('pending-approval', True),