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

Fix main_nav for platform admin

Browse Source 
Renamed or_ to any_
This commit is contained in:
Rebecca Law
2016-03-30 11:30:18 +01:00
parent 953f2a2245
commit e67bb5f716
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/main_nav.html
View File

@@ -12,7 +12,7 @@
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
</ul>
{% elif current_user.has_permissions(['view_activity', 'manage_templates','manage_api_keys'], admin_override=True, or_=True) %}
{% elif current_user.has_permissions(['view_activity', 'manage_templates','manage_api_keys'], admin_override=True, any_=True) %}
<ul>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
@@ -24,7 +24,7 @@
<li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Manage settings</a></li>
</ul>
{% endif %}
{% if current_user.has_permissions(['view_activity'], admin_override=True) %}
{% if current_user.has_permissions(['view_activity']) %}
<ul>
<li><a href="{{ url_for('.manage_users', service_id=service_id) }}">View team members</a></li>
</ul>

4
app/templates/views/choose-template.html
View File

@@ -14,7 +14,7 @@
<h1 class="heading-large">{{ page_heading }}</h1>
{% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True, or_=True) %}
{% if current_user.has_permissions(permissions=['manage_templates'], any_=True) %}
<a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
{% else %}
<p>You need to ask your service manager to add templates before you can send messages</p>
@@ -34,7 +34,7 @@
</div>
{% if not has_jobs %}
{% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'], or_=True) %}
{% if current_user.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'], any_=True) %}
{{ banner(
"""
Send yourself a test

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

@@ -25,7 +25,7 @@
</ul>
{% if not template_count and not jobs %}
{% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], or_=True, admin_override=True) %}
{% if current_user.has_permissions(['manage_templates', 'send_texts', 'send_emails', 'send_letters'], any_=True, admin_override=True) %}
{% call banner_wrapper(subhead='Get started', type="tip") %}
<ol>
{% if current_user.has_permissions(['manage_templates'], admin_override=True) %}