From f549168b5e19f25189a5f9c4f8c35d7acac33cc3 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 20 Oct 2020 11:04:49 +0100 Subject: [PATCH 1/2] Remove the `upload_letters` permission MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every service has it now, and we haven’t had any services ask to toggle it off again. --- app/main/views/service_settings.py | 1 - app/main/views/uploads.py | 2 +- app/models/service.py | 1 - app/templates/views/dashboard/_jobs.html | 2 +- .../views/service_settings/test_service_setting_permissions.py | 3 --- tests/app/main/views/uploads/test_upload_letter.py | 3 +-- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 0430b99b8..880fe070f 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -67,7 +67,6 @@ from app.utils import ( PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([ ('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}), ('email_auth', {'title': 'Email authentication'}), - ('upload_letters', {'title': 'Uploading letters', 'requires': 'letter'}), ('international_letters', {'title': 'Send international letters', 'requires': 'letter'}), ('broadcast', {'title': 'Send cell broadcasts'}), ]) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 8da369bf5..b922191d5 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -341,7 +341,7 @@ def view_letter_upload_as_preview(service_id, file_id): @main.route("/services//upload-letter/send/", methods=['POST']) @user_has_permissions('send_messages', restrict_admin_usage=True) def send_uploaded_letter(service_id, file_id): - if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')): + if not current_service.has_permission('letter'): abort(403) metadata = get_letter_metadata(service_id, file_id) diff --git a/app/models/service.py b/app/models/service.py index a88b580e6..642a4b2a6 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -64,7 +64,6 @@ class Service(JSONModel): 'international_letters', 'international_sms', 'upload_document', - 'upload_letters', 'broadcast', ) diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index cfda4345b..53446f2ed 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -8,7 +8,7 @@ caption="Recent files uploaded", caption_visible=False, empty_message=( - 'Upload a letter and Notify will print, pack and post it for you.' if current_service.can_upload_letters else 'You have not uploaded any files yet' + 'Upload a letter and Notify will print, pack and post it for you.' ), field_headings=[ 'File', diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py index 528f474a5..1ca27fe54 100644 --- a/tests/app/main/views/service_settings/test_service_setting_permissions.py +++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py @@ -119,9 +119,6 @@ def test_service_set_permission( ({'restricted': False}, '.service_switch_live', {}, 'Live On Change service status'), ({'permissions': ['sms']}, '.service_set_inbound_number', {}, 'Receive inbound SMS Off Change your settings for Receive inbound SMS'), - ({'permissions': ['letter']}, - '.service_set_permission', {'permission': 'upload_letters'}, - 'Uploading letters Off Change your settings for Uploading letters'), ({'permissions': ['letter']}, '.service_set_permission', {'permission': 'international_letters'}, 'Send international letters Off Change your settings for Send international letters'), diff --git a/tests/app/main/views/uploads/test_upload_letter.py b/tests/app/main/views/uploads/test_upload_letter.py index 5478f975b..68930b0c1 100644 --- a/tests/app/main/views/uploads/test_upload_letter.py +++ b/tests/app/main/views/uploads/test_upload_letter.py @@ -629,8 +629,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page( @pytest.mark.parametrize('permissions', [ ['email'], - ['letter'], - ['upload_letters'], + ['sms'], ]) def test_send_uploaded_letter_when_service_does_not_have_correct_permissions( mocker, From 7424cb37a334a62b7fd753227b3d7040a95db4db Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 23 Oct 2020 10:57:19 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20talk=20about=20letters=20if?= =?UTF-8?q?=20the=20user=20can=E2=80=99t=20send=20them?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/views/dashboard/_jobs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index 53446f2ed..d65e3573f 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -8,7 +8,7 @@ caption="Recent files uploaded", caption_visible=False, empty_message=( - 'Upload a letter and Notify will print, pack and post it for you.' + 'Upload a letter and Notify will print, pack and post it for you.' if current_service.has_permission('letter') else 'You have not uploaded any files yet.' ), field_headings=[ 'File',