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

Format organisation type nicely in go live requests

Browse Source
This commit is contained in:
Chris Hill-Scott
2021-10-11 14:08:42 +01:00
parent 84195d36af
commit dd573fec87
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/service_settings.py
View File

@@ -232,7 +232,7 @@ def submit_request_to_go_live(service_id):
).format( ).format(
service_name=current_service.name, service_name=current_service.name,
service_dashboard=url_for('main.service_dashboard', service_id=current_service.id, _external=True), service_dashboard=url_for('main.service_dashboard', service_id=current_service.id, _external=True),
organisation_type=str(current_service.organisation_type).title(), organisation_type=current_service.organisation_type_label,
agreement=current_service.organisation.as_agreement_statement_for_go_live_request( agreement=current_service.organisation.as_agreement_statement_for_go_live_request(
current_user.email_domain current_user.email_domain
), ),

4
tests/app/main/views/test_service_settings.py
View File

@@ -1736,7 +1736,7 @@ def test_should_redirect_after_request_to_go_live(
'http://localhost/services/{service_id}\n' 'http://localhost/services/{service_id}\n'
'\n' '\n'
'---\n' '---\n'
'Organisation type: Central\n' 'Organisation type: Central government\n'
'Agreement signed: Can’t tell (domain is user.gov.uk).\n' 'Agreement signed: Can’t tell (domain is user.gov.uk).\n'
'\n' '\n'
'{formatted_displayed_volumes}' '{formatted_displayed_volumes}'
@@ -1819,7 +1819,7 @@ def test_request_to_go_live_displays_go_live_notes_in_zendesk_ticket(
'http://localhost/services/{service_id}\n' 'http://localhost/services/{service_id}\n'
'\n' '\n'
'---\n' '---\n'
'Organisation type: Central\n' 'Organisation type: Central government\n'
'Agreement signed: No (organisation is Org 1, a crown body). {go_live_note}\n' 'Agreement signed: No (organisation is Org 1, a crown body). {go_live_note}\n'
'\n' '\n'
'Emails in next year: 111,111\n' 'Emails in next year: 111,111\n'