From 99bd94799e062e654eb82a4067a068284f0c9eb7 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 29 Mar 2016 17:33:12 +0100 Subject: [PATCH] Remove access_developer_docs permission, it doesn't make sense to need it. Add view_activity permission when the permissions are being editted. --- app/main/views/manage_users.py | 4 ++-- app/main/views/send.py | 2 +- app/templates/main_nav.html | 2 +- app/templates/views/choose-template.html | 4 ++-- app/templates/views/manage-users.html | 4 ++-- tests/app/main/views/test_dashboard.py | 2 +- tests/app/main/views/test_manage_users.py | 5 +++-- tests/app/main/views/test_send.py | 2 +- tests/conftest.py | 3 +-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 709ec1e8d..548b511ad 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -30,7 +30,7 @@ from app.utils import user_has_permissions roles = { 'send_messages': ['send_texts', 'send_emails', 'send_letters'], 'manage_service': ['manage_users', 'manage_templates', 'manage_settings'], - 'manage_api_keys': ['manage_api_keys', 'access_developer_docs'] + 'manage_api_keys': ['manage_api_keys'] } @@ -98,7 +98,7 @@ def edit_user_permissions(service_id, user_id): user_id, service_id, permissions=set(chain.from_iterable( permissions for role, permissions in roles.items() if form[role].data - )) + )) | {'view_activity'} ) return redirect(url_for('.manage_users', service_id=service_id)) diff --git a/app/main/views/send.py b/app/main/views/send.py index 6da51784a..a48d6c6f3 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -198,7 +198,7 @@ def send_message_to_self(service_id, template_id): @main.route("/services//send//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( templates_dao.get_service_template_or_404(service_id, template_id)['data'] diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 09c2229fd..a25182536 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -29,7 +29,7 @@
  • View team members
    • {% endif %} - {% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs']) %} + {% if current_user.has_permissions(['manage_api_keys']) %} diff --git a/app/templates/views/choose-template.html b/app/templates/views/choose-template.html index 9cb126643..022fbfe74 100644 --- a/app/templates/views/choose-template.html +++ b/app/templates/views/choose-template.html @@ -14,7 +14,7 @@

    {{ page_heading }}

    - {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %} + {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True, or_=True) %} Add a new template {% else %}

    You need to ask your service manager to add templates before you can send messages

    @@ -76,7 +76,7 @@ Send a batch Send yourself a test {% endif %} - {% if current_user.has_permissions(permissions=['manage_api_keys', 'access_developer_docs']) %} + {% if current_user.has_permissions(permissions=['manage_api_keys']) %} API integration {% endif %} diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index aa626e5f5..5f0cc021f 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -41,7 +41,7 @@ Manage users – GOV.UK Notify {% endcall %} {{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }} {{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }} - {{ boolean_field(item.has_permissions(permissions=['manage_api_keys', 'access_developer_docs'])) }} + {{ boolean_field(item.has_permissions(permissions=['manage_api_keys'])) }} {% call field(align='right') %} {% if current_user.has_permissions(['manage_users']) %} {% if current_user.id != item.id %} @@ -60,7 +60,7 @@ Manage users – GOV.UK Notify {% endcall %} {{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }} {{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }} - {{ boolean_field(item.has_permissions(permissions=['manage_api_keys', 'access_developer_docs'])) }} + {{ boolean_field(item.has_permissions(permissions=['manage_api_keys'])) }} {% if item.status == 'pending' %} {% call field(align='right') %} {% if current_user.has_permissions(['manage_users']) %} diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 6ef4127aa..5765985cf 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -99,7 +99,7 @@ def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_g app_, api_user_active, service_one, - ['view_activity', 'manage_api_keys', 'access_developer_docs']) + ['view_activity', 'manage_api_keys']) page = resp.get_data(as_text=True) assert url_for( 'main.choose_template', diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index e51e7e602..7ea994730 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -80,7 +80,7 @@ def test_edit_user_permissions( 'manage_templates', 'manage_settings', 'manage_api_keys', - 'access_developer_docs' + 'view_activity' } ) @@ -119,7 +119,8 @@ def test_edit_some_user_permissions( permissions={ 'send_texts', 'send_emails', - 'send_letters' + 'send_letters', + 'view_activity' } ) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index f45ed0c17..d7b96c4aa 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -445,7 +445,7 @@ def test_route_choose_template_manage_api_keys_permissions(mocker, 'main.choose_template', service_id=service_one['id'], template_type='sms'), - ['manage_api_keys', 'access_developer_docs'], + ['manage_api_keys'], api_user_active, service_one) page = resp.get_data(as_text=True) diff --git a/tests/conftest.py b/tests/conftest.py index 011a2ef4c..2d421cc5c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -302,8 +302,7 @@ def active_user_with_permissions(): 'manage_users', 'manage_templates', 'manage_settings', - 'manage_api_keys', - 'access_developer_docs']}, + 'manage_api_keys']}, 'platform_admin': False } user = User(user_data)