From 7582b8face8a4126f4ed28693863de4b0a406a3e Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 26 Mar 2020 17:17:11 +0000 Subject: [PATCH] Remove line about contact lists from uploads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This line doesn’t make sense now that you can upload a contact list in advance of having a template. --- app/templates/views/jobs/jobs.html | 9 ++------- tests/app/main/views/test_uploads.py | 6 ++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html index 27b5fb4b3..a199ac0ce 100644 --- a/app/templates/views/jobs/jobs.html +++ b/app/templates/views/jobs/jobs.html @@ -15,14 +15,9 @@

You have not uploaded any files recently.

- {% if current_user.has_permissions('send_messages') %} - {% if current_service.has_permission('letter') %} -

- Upload a letter and Notify will print, pack and post it for you. -

- {% endif %} + {% if current_user.has_permissions('send_messages') and current_service.has_permission('letter')%}

- To upload a list of contact details, first choose a template. + Upload a letter and Notify will print, pack and post it for you.

{% endif %} {% endif %} diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 2c63839e8..7836f1e6b 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -66,13 +66,11 @@ def test_all_users_have_upload_contact_list( @pytest.mark.parametrize('extra_permissions, expected_empty_message', ( ([], ( - 'You have not uploaded any files recently. ' - 'To upload a list of contact details, first choose a template.' + 'You have not uploaded any files recently.' )), (['letter'], ( 'You have not uploaded any files recently. ' - 'Upload a letter and Notify will print, pack and post it for you. ' - 'To upload a list of contact details, first choose a template.' + 'Upload a letter and Notify will print, pack and post it for you.' )), )) def test_get_upload_hub_with_no_uploads(