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

only set organisation on GET and add allowed fields to service client

Browse Source 
we were overwriting it before validating the form for POST, so lost info
This commit is contained in:
Leo Hemsted
2016-08-12 12:37:18 +01:00
parent 7c16614538
commit fb510d2522
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,17 +276,19 @@ def service_set_branding_and_org(service_id):
form = ServiceBrandingOrg(branding_type=current_service.get('branding'))
# dynamically create org choices, including the null option
form.organisation.choices = [('', 'None')] + get_branding_as_value_and_label(organisations)
form.organisation.data = current_service['organisation'] or ''
form.organisation.choices = [('nil', 'None')] + get_branding_as_value_and_label(organisations)
if form.validate_on_submit():
organisation = None if form.organisation.data == '' else form.organisation.data
organisation = None if form.organisation.data == 'nil' else form.organisation.data
service_api_client.update_service(
service_id,
branding=form.branding_type.data,
organisation=organisation
organisation_id=organisation
)
return redirect(url_for('.service_settings', service_id=service_id))
# only set form.organisation.data on GET (to select correct initial radio button)
form.organisation.data = current_service['organisation'] or 'nil'
return render_template(
'views/service-settings/set-branding-and-org.html',
form=form,