darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 17:24:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display full address on the notifications page

Browse Source 
This is what we do on the uploads page now. It makes it more obvious
why your search term has returned a certain result if you can see most
of the address, not just the first line.
This commit is contained in:
Chris Hill-Scott
2020-07-30 16:40:25 +01:00
parent 2789b6a596
commit 3fbf966719
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/activity/notifications.html
View File

@@ -19,7 +19,7 @@
{% if item.status in ('pending-virus-check', 'virus-scan-failed') %} {% if item.status in ('pending-virus-check', 'virus-scan-failed') %}
<span class="file-list-filename loading-indicator">Checking</span> <span class="file-list-filename loading-indicator">Checking</span>
{% else %} {% else %}
<a class="govuk-link govuk-link--no-visited-state file-list-filename" href="{{ single_notification_url(notification_id=item.id) }}">{{ item.to.splitlines()[0].lstrip().rstrip(' ,') if item.to else '' }}</a> <a class="govuk-link govuk-link--no-visited-state file-list-filename" href="{{ single_notification_url(notification_id=item.id) }}">{{ item.to.splitlines()|join(', ') if item.to else '' }}</a>
{% endif %} {% endif %}
<p class="file-list-hint"> <p class="file-list-hint">
{{ item.preview_of_content }} {{ item.preview_of_content }}

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

@@ -757,8 +757,8 @@ def test_sending_status_hint_displays_correctly_on_notifications_page(
@pytest.mark.parametrize("is_precompiled_letter,expected_address,expected_hint", [ @pytest.mark.parametrize("is_precompiled_letter,expected_address,expected_hint", [
(True, "Full Name,\nFirst address line\npostcode", "ref"), (True, "Full Name\nFirst address line\npostcode", "ref"),
(False, "Full Name,\nFirst address line\npostcode", "template subject") (False, "Full Name\nFirst address line\npostcode", "template subject")
]) ])
def test_should_show_address_and_hint_for_letters( def test_should_show_address_and_hint_for_letters(
client_request, client_request,
@@ -786,5 +786,5 @@ def test_should_show_address_and_hint_for_letters(
message_type='letter', message_type='letter',
) )
assert page.select_one('a.file-list-filename').text == 'Full Name' assert page.select_one('a.file-list-filename').text == 'Full Name, First address line, postcode'
assert page.find('p', {'class': 'file-list-hint'}).text.strip() == expected_hint assert page.find('p', {'class': 'file-list-hint'}).text.strip() == expected_hint