darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-03-13 23:02:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4108 from alphagov/hide-org-report-download-no-services

Browse Source 
Hide ‘Download this report’ link when no services
This commit is contained in:
Chris Hill-Scott
2021-12-30 14:17:59 +00:00
committed by GitHub
parent a3f940d9f4 2f0e3f39d3
commit 93bb29a219
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/views/organisations/organisation/index.html
View File

@@ -110,12 +110,12 @@
{{ current_org.name }} has no live services on GOV.UK Notify
</p>
<div class="keyline-block govuk-!-margin-top-2"></div>
{% else %}
<div class="js-stick-at-bottom-when-scrolling">
<p class="govuk-!-margin-bottom-1">
<a href="{{ download_link }}" download="download" class="govuk-link govuk-link--no-visited-state govuk-!-font-weight-bold">Download this report</a>
</p>
</div>
{% endif %}
<div class="js-stick-at-bottom-when-scrolling">
<p class="govuk-!-margin-bottom-1">
<a href="{{ download_link }}" download="download" class="govuk-link govuk-link--no-visited-state govuk-!-font-weight-bold">Download this report</a>
</p>
</div>
{% endblock %}

4
tests/app/main/views/organisations/test_organisations.py
View File

@@ -92,6 +92,7 @@ def test_view_organisation_shows_the_correct_organisation(
assert normalize_spaces(page.select_one('.govuk-hint').text) == (
'Test 1 has no live services on GOV.UK Notify'
)
assert not page.select('a[download]')
def test_page_to_create_new_organisation(
@@ -668,7 +669,8 @@ def test_organisation_services_links_to_downloadable_report(
client_request.login(active_user_with_permissions)
page = client_request.get('.organisation_dashboard', org_id=ORGANISATION_ID)
link_to_report = page.find('a', text="Download this report")
link_to_report = page.select_one('a[download]')
assert normalize_spaces(link_to_report.text) == 'Download this report'
assert link_to_report.attrs["href"] == url_for(
'.download_organisation_usage_report',
org_id=ORGANISATION_ID,