mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 00:07:02 -04:00
Admins won't see buttons for broadcast actions they can't do
These actions are creating, accepting and rejecting broadcasts.
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
'current_broadcasts'
|
'current_broadcasts'
|
||||||
) }}
|
) }}
|
||||||
|
|
||||||
{% if current_user.has_permissions('send_messages') %}
|
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
<div class="js-stick-at-bottom-when-scrolling">
|
<div class="js-stick-at-bottom-when-scrolling">
|
||||||
{{ govukButton({
|
{{ govukButton({
|
||||||
"element": "a",
|
"element": "a",
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
{% include('views/broadcast/partials/dashboard-table.html') %}
|
{% include('views/broadcast/partials/dashboard-table.html') %}
|
||||||
|
|
||||||
{% if current_user.has_permissions('send_messages') %}
|
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
<div class="js-stick-at-bottom-when-scrolling">
|
<div class="js-stick-at-bottom-when-scrolling">
|
||||||
{{ govukButton({
|
{{ govukButton({
|
||||||
"element": "a",
|
"element": "a",
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
|
|
||||||
{% block service_page_title %}
|
{% block service_page_title %}
|
||||||
{% if broadcast_message.status == 'pending-approval' %}
|
{% if broadcast_message.status == 'pending-approval' %}
|
||||||
{% if broadcast_message.created_by and broadcast_message.created_by == current_user and current_user.has_permissions('send_messages') %}
|
{% if broadcast_message.created_by and broadcast_message.created_by == current_user and current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
{{ broadcast_message.template.name }} is waiting for approval
|
{{ broadcast_message.template.name }} is waiting for approval
|
||||||
{% elif current_user.has_permissions('send_messages') %}
|
{% elif current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
{% if broadcast_message.created_by %}
|
{% if broadcast_message.created_by %}
|
||||||
{{ broadcast_message.created_by.name }}
|
{{ broadcast_message.created_by.name }}
|
||||||
{% else %}
|
{% else %}
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
{{ govukBackLink({ "href": back_link }) }}
|
{{ govukBackLink({ "href": back_link }) }}
|
||||||
|
|
||||||
{% if broadcast_message.status == 'pending-approval' %}
|
{% if broadcast_message.status == 'pending-approval' %}
|
||||||
{% if broadcast_message.created_by and broadcast_message.created_by == current_user and current_user.has_permissions('send_messages') %}
|
{% if broadcast_message.created_by and broadcast_message.created_by == current_user and current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
<div class="banner govuk-!-margin-bottom-6">
|
<div class="banner govuk-!-margin-bottom-6">
|
||||||
<h1 class="govuk-heading-m govuk-!-margin-bottom-3">
|
<h1 class="govuk-heading-m govuk-!-margin-bottom-3">
|
||||||
{{ broadcast_message.template.name }} is waiting for approval
|
{{ broadcast_message.template.name }} is waiting for approval
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
</details>
|
</details>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% elif current_user.has_permissions('send_messages') %}
|
{% elif current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
|
||||||
{% call form_wrapper(class="banner govuk-!-margin-bottom-6") %}
|
{% call form_wrapper(class="banner govuk-!-margin-bottom-6") %}
|
||||||
<h1 class="govuk-heading-m govuk-!-margin-top-0 govuk-!-margin-bottom-3">
|
<h1 class="govuk-heading-m govuk-!-margin-top-0 govuk-!-margin-bottom-3">
|
||||||
{% if broadcast_message.created_by %}
|
{% if broadcast_message.created_by %}
|
||||||
|
|||||||
@@ -388,6 +388,7 @@ def test_broadcast_dashboard(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("user_is_platform_admin", [True, False])
|
||||||
@pytest.mark.parametrize('endpoint', (
|
@pytest.mark.parametrize('endpoint', (
|
||||||
'.broadcast_dashboard', '.broadcast_dashboard_previous', '.broadcast_dashboard_rejected',
|
'.broadcast_dashboard', '.broadcast_dashboard_previous', '.broadcast_dashboard_rejected',
|
||||||
))
|
))
|
||||||
@@ -395,11 +396,17 @@ def test_broadcast_dashboard_does_not_have_button_for_view_only_user(
|
|||||||
client_request,
|
client_request,
|
||||||
service_one,
|
service_one,
|
||||||
active_user_view_permissions,
|
active_user_view_permissions,
|
||||||
|
platform_admin_user_no_service_permissions,
|
||||||
mock_get_broadcast_messages,
|
mock_get_broadcast_messages,
|
||||||
endpoint,
|
endpoint,
|
||||||
|
user_is_platform_admin
|
||||||
):
|
):
|
||||||
|
if user_is_platform_admin:
|
||||||
|
client_request.login(platform_admin_user_no_service_permissions)
|
||||||
|
else:
|
||||||
|
client_request.login(active_user_view_permissions)
|
||||||
|
|
||||||
service_one['permissions'] += ['broadcast']
|
service_one['permissions'] += ['broadcast']
|
||||||
client_request.login(active_user_view_permissions)
|
|
||||||
page = client_request.get(
|
page = client_request.get(
|
||||||
endpoint,
|
endpoint,
|
||||||
service_id=SERVICE_ONE_ID,
|
service_id=SERVICE_ONE_ID,
|
||||||
@@ -1841,14 +1848,17 @@ def test_can_approve_own_broadcast_in_trial_mode(
|
|||||||
|
|
||||||
|
|
||||||
@freeze_time('2020-02-22T22:22:22.000000')
|
@freeze_time('2020-02-22T22:22:22.000000')
|
||||||
|
@pytest.mark.parametrize("user_is_platform_admin", [True, False])
|
||||||
def test_view_only_user_cant_approve_broadcast(
|
def test_view_only_user_cant_approve_broadcast(
|
||||||
mocker,
|
mocker,
|
||||||
client_request,
|
client_request,
|
||||||
service_one,
|
service_one,
|
||||||
active_user_with_permissions,
|
active_user_with_permissions,
|
||||||
active_user_view_permissions,
|
active_user_view_permissions,
|
||||||
|
platform_admin_user_no_service_permissions,
|
||||||
mock_get_broadcast_template,
|
mock_get_broadcast_template,
|
||||||
fake_uuid,
|
fake_uuid,
|
||||||
|
user_is_platform_admin
|
||||||
):
|
):
|
||||||
mocker.patch(
|
mocker.patch(
|
||||||
'app.broadcast_message_api_client.get_broadcast_message',
|
'app.broadcast_message_api_client.get_broadcast_message',
|
||||||
@@ -1861,8 +1871,12 @@ def test_view_only_user_cant_approve_broadcast(
|
|||||||
status='pending-approval',
|
status='pending-approval',
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
if user_is_platform_admin:
|
||||||
|
current_user = platform_admin_user_no_service_permissions
|
||||||
|
else:
|
||||||
|
current_user = active_user_view_permissions
|
||||||
mocker.patch('app.user_api_client.get_user', side_effect=[
|
mocker.patch('app.user_api_client.get_user', side_effect=[
|
||||||
active_user_view_permissions, # Current user
|
current_user, # Current user
|
||||||
active_user_with_permissions, # User who created broadcast
|
active_user_with_permissions, # User who created broadcast
|
||||||
])
|
])
|
||||||
service_one['permissions'] += ['broadcast']
|
service_one['permissions'] += ['broadcast']
|
||||||
|
|||||||
Reference in New Issue
Block a user