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

Merge pull request #2982 from alphagov/terse-org-set-text

Browse Source 
Make ‘you must set organisation’ text shorter
This commit is contained in:
Chris Hill-Scott
2019-05-21 15:24:27 +01:00
committed by GitHub
parent f0da3e877f 9d40986d53
commit 0609229466
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/service-settings.html
View File

@@ -292,7 +292,7 @@
{% call row() %} {% call row() %}
{{ text_field('Live')}} {{ text_field('Live')}}
{% if current_service.trial_mode and not current_service.organisation %} {% if current_service.trial_mode and not current_service.organisation %}
{{ text_field('No (you need to assign this service to an organisation before you can make it live)') }} {{ text_field('No (organisation must be set first)') }}
{{ text_field('') }} {{ text_field('') }}
{% else %} {% else %}
{{ boolean_field(not current_service.trial_mode) }} {{ boolean_field(not current_service.trial_mode) }}

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

@@ -158,7 +158,7 @@ def test_no_go_live_link_for_service_without_organisation(
assert page.find('h1').text == 'Settings' assert page.find('h1').text == 'Settings'
assert normalize_spaces(page.select('tr')[16].text) == ( assert normalize_spaces(page.select('tr')[16].text) == (
'Live No (you need to assign this service to an organisation before you can make it live)' 'Live No (organisation must be set first)'
) )
assert normalize_spaces(page.select('tr')[18].text) == ( assert normalize_spaces(page.select('tr')[18].text) == (
'Organisation Not set Change' 'Organisation Not set Change'