remove all instances of db style permissions

lots of renaming of send_texts/emails/letters to send_messages, and
manage_settings/users to manage_service
This commit is contained in:
Leo Hemsted
2018-02-28 17:22:20 +00:00
parent 17061e0d06
commit 09824078dd
24 changed files with 108 additions and 109 deletions

View File

@@ -48,10 +48,10 @@
<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_users', 'manage_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<li><a href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
{% endif %}
{% if current_user.has_permissions('manage_api_keys', 'manage_settings', admin_override=True, any_=True) %}
{% if current_user.has_permissions('manage_api_keys', 'manage_service', admin_override=True, 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) %}

View File

@@ -22,7 +22,7 @@
'messages',
) }}
{% if current_user.has_permissions('send_texts', admin_override=True) %}
{% if current_user.has_permissions('send_messages', admin_override=True) %}
<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>

View File

@@ -19,7 +19,7 @@
{% if not templates %}
{% include 'views/dashboard/write-first-messages.html' %}
{% endif %}
{% elif not current_user.has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_api_keys', any_=True) %}
{% elif not current_user.has_permissions('send_messages', 'manage_api_keys', any_=True) %}
{% include 'views/dashboard/no-permissions-banner.html' %}
{% endif %}

View File

@@ -24,7 +24,7 @@
Team members
</h1>
</div>
{% if current_user.has_permissions('manage_users', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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>
@@ -64,7 +64,7 @@
<ul class="tick-cross-list">
<div class="tick-cross-list-permissions">
{{ tick_cross(
user.has_permissions('send_texts', 'send_emails', 'send_letters'),
user.has_permissions('send_messages'),
'Send messages'
) }}
{{ tick_cross(
@@ -72,7 +72,7 @@
'Add and edit templates'
) }}
{{ tick_cross(
user.has_permissions('manage_users', 'manage_settings'),
user.has_permissions('manage_service'),
'Manage service'
) }}
{{ tick_cross(
@@ -89,7 +89,7 @@
</div>
{% endif %}
</div>
{% if current_user.has_permissions('manage_users', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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>

View File

@@ -45,7 +45,7 @@
{{ ajax_block(partials, updates_url, 'status', finished=finished) }}
{% endif %}
{% if current_user.has_permissions('send_texts', admin_override=True) and template.template_type == 'sms' and can_receive_inbound %}
{% if current_user.has_permissions('send_messages', admin_override=True) 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>

View File

@@ -26,7 +26,7 @@
{{ edit_field(
'Change',
url_for('.service_name_change', service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -42,7 +42,7 @@
'Change',
url_for('.service_set_auth_type',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -63,7 +63,7 @@
'Change',
url_for('.service_set_email',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -85,7 +85,7 @@
'Manage' if reply_to_email_address_count else 'Change',
url_for('.service_email_reply_to',
service_id=current_service.id),
permissions=['manage_settings','manage_api_keys']
permissions=['manage_service','manage_api_keys']
)
}}
{% endcall %}
@@ -108,7 +108,7 @@
'Change',
url_for('.service_set_sms',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -129,7 +129,7 @@
'Manage' if sms_sender_count else 'Change',
url_for('.service_sms_senders',
service_id=current_service.id),
permissions=['manage_settings','manage_api_keys']
permissions=['manage_service','manage_api_keys']
)
}}
{% endcall %}
@@ -141,7 +141,7 @@
'Change',
url_for('.service_set_sms_prefix',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -153,7 +153,7 @@
'Change',
url_for('.service_set_international_sms',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -165,7 +165,7 @@
'Change',
url_for('.service_set_inbound_sms',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -188,7 +188,7 @@
'Change',
url_for('.service_set_letters',
service_id=current_service.id),
permissions=['manage_settings']
permissions=['manage_service']
)
}}
{% endcall %}
@@ -208,7 +208,7 @@
'Manage' if letter_contact_details_count else 'Change',
url_for('.service_letter_contact_details',
service_id=current_service.id),
permissions=['manage_settings','manage_api_keys']
permissions=['manage_service','manage_api_keys']
)
}}
{% endcall %}
@@ -227,7 +227,7 @@
</ul>
<p>
{% if current_user.has_permissions('manage_settings') %}
{% 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 %}

View File

@@ -15,7 +15,7 @@
Email reply to addresses
</h1>
</div>
{% if current_user.has_permissions('manage_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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 %}

View File

@@ -15,7 +15,7 @@
Sender addresses
</h1>
</div>
{% if current_user.has_permissions('manage_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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 %}

View File

@@ -14,7 +14,7 @@
Text message senders
</h1>
</div>
{% if current_user.has_permissions('manage_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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_settings', admin_override=True) %}
{% if current_user.has_permissions('manage_service', admin_override=True) %}
<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 %}

View File

@@ -6,7 +6,7 @@
{% else %}
<div class="bottom-gutter-2-3">
<div class="grid-row">
{% if current_user.has_permissions('send_texts', 'send_emails', 'send_letters') %}
{% if current_user.has_permissions('send_messages') %}
<div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}">
<a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
Upload recipients