diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html index 0b88d0c34..4f4533dad 100644 --- a/app/templates/views/jobs/jobs.html +++ b/app/templates/views/jobs/jobs.html @@ -9,26 +9,22 @@ {% block maincolumn_content %}

Uploads

- {% if show_scheduled_jobs %} - {% with hide_heading = True %} - {% include 'views/jobs/_scheduled.html' %} - {% endwith %} - {% endif %} {% if jobs %} {% include 'views/dashboard/_jobs.html' %} - {% endif %} - {% if not jobs and not show_scheduled_jobs %} + {% else %}

You have not uploaded any files recently.

- {% if current_service.has_permission('upload_letters') %} + {% 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 %}

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

{% endif %} -

- To upload a list of contact details, first choose a template. -

{% endif %} {{ previous_next_navigation(prev_page, next_page) }} {% if current_user.has_permissions('send_messages') %} diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 1491b45d6..2c63839e8 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -65,11 +65,11 @@ def test_all_users_have_upload_contact_list( @pytest.mark.parametrize('extra_permissions, expected_empty_message', ( - (['letter'], ( + ([], ( 'You have not uploaded any files recently. ' 'To upload a list of contact details, first choose a template.' )), - (['letter', 'upload_letters'], ( + (['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.'