Merge pull request #358 from alphagov/fix-permissions

Add view_activity permissions
This commit is contained in:
Rebecca Law
2016-03-30 11:36:49 +01:00
22 changed files with 131 additions and 137 deletions

View File

@@ -64,8 +64,12 @@ def get_page_headings(template_type):
@main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', 'manage_api_keys',
admin_override=True, or_=True)
@user_has_permissions('view_activity',
'send_texts',
'send_emails',
'manage_templates',
'manage_api_keys',
admin_override=True, any_=True)
def choose_template(service_id, template_type):
service = service_api_client.get_service(service_id)['data']
@@ -140,7 +144,7 @@ def send_messages(service_id, template_id):
@main.route("/services/<service_id>/send/<template_id>.csv", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True)
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', any_=True)
def get_example_csv(service_id, template_id):
template = Template(service_api_client.get_service_template(service_id, template_id)['data'])
# Good practice to use context managers
@@ -203,7 +207,7 @@ def send_message_to_self(service_id, template_id):
@main.route("/services/<service_id>/send/<template_id>/from-api", methods=['GET'])
@login_required
@user_has_permissions('manage_api_keys', 'access_developer_docs')
@user_has_permissions('manage_api_keys')
def send_from_api(service_id, template_id):
template = Template(
service_api_client.get_service_template(service_id, template_id)['data']