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

remove admin_override from all has_permissions usage

Browse Source 
as previously pointed out, it's not used anywhere.
This commit is contained in:
Leo Hemsted
2018-03-01 10:30:17 +00:00
parent 3ae815528c
commit 4a08cf81e7
27 changed files with 108 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/components/table.html
View File

@@ -107,7 +107,7 @@
{% macro edit_field(text, link, permissions=[]) -%}
{% call field(align='right') %}
{% if current_user.has_permissions(*permissions, **{'any_':True, 'admin_override': True}) or not permissions %}
{% if current_user.has_permissions(*permissions, **{'any_': True}) or not permissions %}
<a href="{{ link }}">{{ text }}</a>
{% endif %}
{% endcall %}

8
app/templates/main_nav.html
View File

@@ -44,17 +44,17 @@
<nav class="navigation">
<ul>
<li><a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
{% if current_user.has_permissions('view_activity', admin_override=True) %}
{% if current_user.has_permissions('view_activity') %}
<li><a href="{{ url_for('.choose_template', service_id=current_service.id) }}">Templates</a></li>
{% endif %}
<li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<li><a href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
{% endif %}
{% if current_user.has_permissions('manage_api_keys', 'manage_service', admin_override=True, any_=True) %}
{% if current_user.has_permissions('manage_api_keys', 'manage_service', any_=True) %}
<li><a href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
{% endif %}
{% if current_user.has_permissions('manage_api_keys', admin_override=True) %}
{% if current_user.has_permissions('manage_api_keys') %}
<li><a href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li>
{% endif %}
</ul>

2
app/templates/views/conversations/conversation.html
View File

@@ -22,7 +22,7 @@
'messages',
) }}
{% if current_user.has_permissions('send_messages', admin_override=True) %}
{% if current_user.has_permissions('send_messages') %}
<p class="sms-message-reply-link">
<a href="{{ url_for('.conversation_reply', service_id=current_service.id, notification_id=notification_id) }}">Send a text message to this phone number</a>
</p>

4
app/templates/views/dashboard/dashboard.html
View File

@@ -15,11 +15,11 @@
<div class="dashboard">
<h1 class="visuallyhidden">Dashboard</h1>
{% if current_user.has_permissions('manage_templates', admin_override=True) %}
{% if current_user.has_permissions('manage_templates') %}
{% if not templates %}
{% include 'views/dashboard/write-first-messages.html' %}
{% endif %}
{% elif not current_user.has_permissions('send_messages', 'manage_api_keys', any_=True, admin_override=True) %}
{% elif not current_user.has_permissions('send_messages', 'manage_api_keys', any_=True) %}
{% include 'views/dashboard/no-permissions-banner.html' %}
{% endif %}

4
app/templates/views/manage-users.html
View File

@@ -24,7 +24,7 @@
Team members
</h1>
</div>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<div class="column-one-third">
<a href="{{ url_for('.invite_user', service_id=current_service.id) }}" class="button align-with-heading">Invite team member</a>
</div>
@@ -89,7 +89,7 @@
</div>
{% endif %}
</div>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<li class="tick-cross-list-edit-link">
{% if user.status == 'pending' %}
<a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation</a>

2
app/templates/views/notifications/notification.html
View File

@@ -45,7 +45,7 @@
{{ ajax_block(partials, updates_url, 'status', finished=finished) }}
{% endif %}
{% if current_user.has_permissions('send_messages', admin_override=True) and template.template_type == 'sms' and can_receive_inbound %}
{% if current_user.has_permissions('send_messages') and template.template_type == 'sms' and can_receive_inbound %}
<p>
<a href="{{ url_for('.conversation', service_id=current_service.id, notification_id=notification_id, _anchor='n{}'.format(notification_id)) }}">See all text messages sent to this phone number</a>
</p>

2
app/templates/views/service-settings.html
View File

@@ -227,7 +227,7 @@
</ul>
<p>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
To remove these restrictions
<a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
{% else %}

4
app/templates/views/service-settings/email_reply_to.html
View File

@@ -15,7 +15,7 @@
Email reply to addresses
</h1>
</div>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<div class="column-one-third">
<a href="{{ url_for('.service_add_email_reply_to', service_id=current_service.id) }}" class="button align-with-heading">Add email address</a>
</div>
@@ -36,7 +36,7 @@
{% endif %}
</span>
</h3>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<a class="user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">Change</a>
{% endif %}
{% if reply_to_email_addresses|length > 1 %}

4
app/templates/views/service-settings/letter-contact-details.html
View File

@@ -15,7 +15,7 @@
Sender addresses
</h1>
</div>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<div class="column-one-third">
<a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id) }}" class="button align-with-heading">Add a new address</a>
</div>
@@ -37,7 +37,7 @@
(default)
{% endif %}
</p>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<a class="user-list-edit-link" href="{{ url_for('.service_edit_letter_contact', service_id =current_service.id, letter_contact_id = item.id) }}">Change</a>
{% endif %}
{% if letter_contact_details|length > 1 %}

2
app/templates/views/service-settings/set-inbound-sms.html
View File

@@ -19,7 +19,7 @@
If you want to turn this feature off,
<a href="{{ url_for('.support') }}">get in touch with the GOV.UK Notify team</a>.
</p>
{% if current_user.has_permissions('manage_api_keys', admin_override=True) %}
{% if current_user.has_permissions('manage_api_keys') %}
<p>
You can set up callbacks for received text messages on the
<a href="{{ url_for('.api_callbacks', service_id=current_service.id) }}">API integration page</a>.

4
app/templates/views/service-settings/sms-senders.html
View File

@@ -14,7 +14,7 @@
Text message senders
</h1>
</div>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<div class="column-one-third">
<a href="{{ url_for('.service_add_sms_sender', service_id=current_service.id) }}" class="button align-with-heading">Add text message sender</a>
</div>
@@ -37,7 +37,7 @@
</span>
{% endif %}
</h3>
{% if current_user.has_permissions('manage_service', admin_override=True) %}
{% if current_user.has_permissions('manage_service') %}
<a class="user-list-edit-link" href="{{ url_for('.service_edit_sms_sender', service_id=current_service.id, sms_sender_id = item.id) }}">Change</a>
{% endif %}
{% if sms_senders|length > 1 %}

4
app/templates/views/templates/_template.html
View File

@@ -19,7 +19,7 @@
</div>
{% endif %}
{% if
current_user.has_permissions('manage_templates', admin_override=True) and
current_user.has_permissions('manage_templates') and
template.template_type != 'letter'
%}
<div class="column-one-third">
@@ -33,7 +33,7 @@
{% endif %}
</div>
<div class="column-whole template-container">
{% if current_user.has_permissions('manage_templates', admin_override=True) and template.template_type == 'letter' %}
{% if current_user.has_permissions('manage_templates') and template.template_type == 'letter' %}
<a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-body">Edit</a>
<a href="{{ url_for(".set_template_sender", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-contact">Edit</a>
{% endif %}

2
app/templates/views/templates/choose.html
View File

@@ -41,7 +41,7 @@
<div class="column-two-thirds">
<h1 class="heading-large">Templates</h1>
</div>
{% if current_user.has_permissions('manage_templates', admin_override=True) %}
{% if current_user.has_permissions('manage_templates') %}
<div class="column-one-third">
<a href="{{ url_for('.add_template_by_type', service_id=current_service.id) }}" class="button align-with-heading">Add new template</a>
</div>

2
app/templates/views/templates/template.html
View File

@@ -63,7 +63,7 @@
&emsp;
<br/>
{% endif %}
{% if current_user.has_permissions('manage_templates', admin_override=True) %}
{% if current_user.has_permissions('manage_templates') %}
{% if not template._template.archived %}
<span class="page-footer-delete-link page-footer-delete-link-without-button bottom-gutter-2-3">
<a href="{{ url_for('.delete_service_template', service_id=current_service.id, template_id=template.id) }}">Delete this template</a>