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

Merge pull request #3552 from alphagov/cant-self-approve

Browse Source 
Don’t let users self-approve broadcasts
This commit is contained in:
Chris Hill-Scott
2020-08-06 14:04:07 +01:00
committed by GitHub
parent cd398ab55c 479406c02d
commit 0e99bede68
4 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/broadcast-tour/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 116 KiB

7
app/models/broadcast_message.py
View File

@@ -3,6 +3,7 @@ from datetime import datetime
from notifications_utils.broadcast_areas import broadcast_area_libraries
from notifications_utils.template import BroadcastPreviewTemplate
from orderedset import OrderedSet
from werkzeug.utils import cached_property
from app.models import JSONModel, ModelList
from app.models.user import User
@@ -94,15 +95,15 @@ class BroadcastMessage(JSONModel):
return 'completed'
return self._dict['status']
@property
@cached_property
def created_by(self):
return User.from_id(self.created_by_id)
@property
@cached_property
def approved_by(self):
return User.from_id(self.approved_by_id)
@property
@cached_property
def cancelled_by(self):
return User.from_id(self.cancelled_by_id)

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

@@ -1,5 +1,6 @@
{% from "components/button/macro.njk" import govukButton %}
{% from "components/form.html" import form_wrapper %}
{% from "components/banner.html" import banner %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
@@ -17,17 +18,30 @@
) }}
{% if broadcast_message.status == 'pending-approval' %}
{% 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
message until {{ broadcast_message.finishes_at|format_datetime_relative }}.
</p>
{{ page_footer(
"Start broadcasting now",
delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
delete_link_text='Reject this broadcast'
) }}
{% endcall %}
{% if broadcast_message.created_by == current_user %}
<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
{{ broadcast_message.finishes_at|format_datetime_relative }}
</p>
{{ page_footer(
delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
delete_link_text='Withdraw this broadcast'
) }}
</div>
{% else %}
{% 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
message until {{ broadcast_message.finishes_at|format_datetime_relative }}.
</p>
{{ page_footer(
"Start broadcasting now",
delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
delete_link_text='Reject this broadcast'
) }}
{% endcall %}
{% endif %}
{% else %}
<p class="govuk-body govuk-!-margin-bottom-3">
Created by {{ broadcast_message.created_by.name }} and approved by