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

Merge pull request #3770 from alphagov/fix-extend-params-bug

Browse Source 
Fix bug with extend_params function
This commit is contained in:
Tom Byers
2021-01-27 10:52:51 +00:00
committed by GitHub
parent 8e3aeea9a0 67392e97ee
commit e013fbb9b3
3 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/main/forms.py
View File

@@ -637,30 +637,6 @@ class RegisterUserFromOrgInviteForm(StripWhitespaceForm):
auth_type = HiddenField('auth_type', validators=[DataRequired()])
def extend_params(params, extensions):
items = None
param_items = len(params['items']) if 'items' in params else 0
# split items off from params to make it a pure dict
if 'items' in extensions:
items = extensions['items']
del extensions['items']
# merge dicts
merge_jsonlike(params, extensions)
# merge items
if items:
if 'items' not in params:
params['items'] = items
else:
for idx, _item in enumerate(items):
if idx >= param_items:
params['items'].append(items[idx])
else:
params['items'][idx].update(items[idx])
def govuk_checkbox_field_widget(self, field, param_extensions=None, **kwargs):
# error messages
@@ -692,11 +668,11 @@ def govuk_checkbox_field_widget(self, field, param_extensions=None, **kwargs):
# extend default params with any sent in during instantiation
if self.param_extensions:
extend_params(params, self.param_extensions)
merge_jsonlike(params, self.param_extensions)
# add any sent in though use in templates
if param_extensions:
extend_params(params, param_extensions)
merge_jsonlike(params, param_extensions)
return Markup(
render_template('forms/fields/checkboxes/macro.njk', params=params))
@@ -748,11 +724,11 @@ def govuk_checkboxes_field_widget(self, field, wrap_in_collapsible=False, param_
# extend default params with any sent in during instantiation
if self.param_extensions:
extend_params(params, self.param_extensions)
merge_jsonlike(params, self.param_extensions)
# add any sent in though use in templates
if param_extensions:
extend_params(params, param_extensions)
merge_jsonlike(params, param_extensions)
if wrap_in_collapsible:
@@ -802,11 +778,11 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
# extend default params with any sent in during instantiation
if self.param_extensions:
extend_params(params, self.param_extensions)
merge_jsonlike(params, self.param_extensions)
# add any sent in though use in templates
if param_extensions:
extend_params(params, param_extensions)
merge_jsonlike(params, param_extensions)
return Markup(
render_template('components/radios/template.njk', params=params))