darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 11:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3388 from alphagov/remove-contact-list-hint

Browse Source 
Remove line about contact lists from uploads
This commit is contained in:
Chris Hill-Scott
2020-04-02 11:04:14 +01:00
committed by GitHub
parent 1947b62ed9 7582b8face
commit c448eb8995
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/templates/views/jobs/jobs.html
View File

@@ -15,14 +15,9 @@
<p class="govuk-body"> <p class="govuk-body">
You have not uploaded any files recently. You have not uploaded any files recently.
</p> </p>
{% if current_user.has_permissions('send_messages') %} {% if current_user.has_permissions('send_messages') and current_service.has_permission('letter')%}
{% if current_service.has_permission('letter') %}
<p class="govuk-body">
Upload a letter and Notify will print, pack and post it for you.
</p>
{% endif %}
<p class="govuk-body"> <p class="govuk-body">
To upload a list of contact details, first <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.choose_template', service_id=current_service.id) }}">choose a template</a>. Upload a letter and Notify will print, pack and post it for you.
</p> </p>
{% endif %} {% endif %}
{% endif %} {% endif %}

6
tests/app/main/views/test_uploads.py
View File

@@ -66,13 +66,11 @@ def test_all_users_have_upload_contact_list(
@pytest.mark.parametrize('extra_permissions, expected_empty_message', ( @pytest.mark.parametrize('extra_permissions, expected_empty_message', (
([], ( ([], (
'You have not uploaded any files recently. ' 'You have not uploaded any files recently.'
'To upload a list of contact details, first choose a template.'
)), )),
(['letter'], ( (['letter'], (
'You have not uploaded any files recently. ' 'You have not uploaded any files recently. '
'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.'
'To upload a list of contact details, first choose a template.'
)), )),
)) ))
def test_get_upload_hub_with_no_uploads( def test_get_upload_hub_with_no_uploads(