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

Merge pull request #4025 from alphagov/fix-showing-radios-on-error

Browse Source 
Fix showing service type radios on error
This commit is contained in:
Ben Thorner
2021-09-17 15:20:31 +01:00
committed by GitHub
parent 6ef39e2ebf 41f44c51fe
commit a02596c481
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/main/views/add_service.py
View File

@@ -53,7 +53,6 @@ def add_service():
form = CreateServiceForm( form = CreateServiceForm(
organisation_type=default_organisation_type organisation_type=default_organisation_type
) )
heading = 'About your service'
if form.validate_on_submit(): if form.validate_on_submit():
email_from = email_safe(form.name.data) email_from = email_safe(form.name.data)
@@ -66,7 +65,7 @@ def add_service():
form, form,
) )
if error: if error:
return render_template('views/add-service.html', form=form, heading=heading) return _render_add_service_page(form, default_organisation_type)
if len(service_api_client.get_active_services({'user_id': session['user_id']}).get('data', [])) > 1: if len(service_api_client.get_active_services({'user_id': session['user_id']}).get('data', [])) > 1:
return redirect(url_for('main.service_dashboard', service_id=service_id)) return redirect(url_for('main.service_dashboard', service_id=service_id))
@@ -78,17 +77,23 @@ def add_service():
template_id=example_sms_template['data']['id'] template_id=example_sms_template['data']['id']
)) ))
else: else:
if default_organisation_type == 'local': return _render_add_service_page(form, default_organisation_type)
return render_template(
'views/add-service-local.html',
form=form,
heading=heading,
default_organisation_type=default_organisation_type,
)
def _render_add_service_page(form, default_organisation_type):
heading = 'About your service'
if default_organisation_type == 'local':
return render_template( return render_template(
'views/add-service.html', 'views/add-service-local.html',
form=form, form=form,
heading=heading, heading=heading,
default_organisation_type=default_organisation_type, default_organisation_type=default_organisation_type,
) )
return render_template(
'views/add-service.html',
form=form,
heading=heading,
default_organisation_type=default_organisation_type,
)