entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

general: consider typeless parameters in json cells as strings (#17550)

This commit is contained in:
Thomas NOËL 2017-07-11 19:02:51 +02:00
parent 7603f89c08
commit bc3d98a83b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/data/forms.py
View File

@ -98,7 +98,7 @@ class ConfigJsonForm(forms.ModelForm):
'bool': forms.BooleanField,
}
for field in self.formdef:
field_class = field_classes.get(field['type'], forms.CharField)
field_class = field_classes.get(field.get('type'), forms.CharField)
self.fields[field['varname']] = field_class(
label=field['label'],
required=field.get('required', True),

7
tests/test_manager.py
View File

@ -518,11 +518,16 @@ def test_edit_config_json_cell(app, admin_user):
'varname': 'test2',
'required': False,
},
{
'label': 'Test no type is string',
'varname': 'test3',
},
]}}):
resp = app.get('/manage/pages/%s/' % page.id)
assert not 'There are no options for this cell.' in resp.form.text
resp.form['c%s-test' % cells[0].get_reference()].value = 'Hello world'
resp.form['c%s-test3' % cells[0].get_reference()].value = 'Hello again'
resp = resp.form.submit()
assert resp.status_int == 302
assert resp.location == 'http://testserver/manage/pages/%s/' % page.id
@ -530,6 +535,7 @@ def test_edit_config_json_cell(app, admin_user):
resp = app.get('/manage/pages/%s/' % page.id)
assert resp.form['c%s-test' % cells[0].get_reference()].value == 'Hello world'
assert resp.form['c%s-test2' % cells[0].get_reference()].checked is False
assert resp.form['c%s-test3' % cells[0].get_reference()].value == 'Hello again'
resp = app.get('/manage/pages/%s/' % page.id)
assert ('data-cell-reference="%s"' % cells[0].get_reference()) in resp.body
@ -542,6 +548,7 @@ def test_edit_config_json_cell(app, admin_user):
resp = app.get('/manage/pages/%s/' % page.id)
assert resp.form['c%s-test' % cells[0].get_reference()].value == 'World Hello'
assert resp.form['c%s-test2' % cells[0].get_reference()].checked is True
assert resp.form['c%s-test3' % cells[0].get_reference()].value == 'Hello again'
def test_logout(app, admin_user):