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

Merge pull request #3854 from alphagov/admin-cancel-broadcast

Browse Source 
Allow platform admins to cancel broadcasts.
This commit is contained in:
Pea Tyczynska
2021-04-21 12:52:14 +01:00
committed by GitHub
parent bda66245a8 d77ec8a5ca
commit c55cc4574e
7 changed files with 159 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
'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">
{{ govukButton({
"element": "a",

2
app/templates/views/broadcast/previous-broadcasts.html
View File

@@ -13,7 +13,7 @@
{% 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">
{{ govukButton({
"element": "a",

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

@@ -19,9 +19,9 @@
{% block service_page_title %}
{% 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
{% elif current_user.has_permissions('send_messages') %}
{% elif current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
{% if broadcast_message.created_by %}
{{ broadcast_message.created_by.name }}
{% else %}
@@ -42,7 +42,7 @@
{{ govukBackLink({ "href": back_link }) }}
{% 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">
<h1 class="govuk-heading-m govuk-!-margin-bottom-3">
{{ broadcast_message.template.name }} is waiting for approval
@@ -81,7 +81,7 @@
</details>
{% endif %}
</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") %}
<h1 class="govuk-heading-m govuk-!-margin-top-0 govuk-!-margin-bottom-3">
{% if broadcast_message.created_by %}