From 9076053f7e3ab9fb8a3028d220a94c4a08269cd8 Mon Sep 17 00:00:00 2001 From: Carlos Costa Date: Tue, 12 Jun 2018 19:55:25 -0300 Subject: [PATCH] correction to generate options also for fields generated with requires=IS_IN_SET or any field with options attribute --- gluon/sqlhtml.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index b37e6b93..88a79861 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2027,12 +2027,6 @@ class SQLFORM(FORM): value_input = widget_.widget(field, field.default, _id=_id, _class=widget_._class + ' form-control', **iso_format) - elif hasattr(field.requires, 'options'): - value_input = SELECT( - *[OPTION(v, _value=k) - for k, v in field.requires.options()], - _class='form-control', - **dict(_id=_id)) elif (field_type.startswith('integer') or field_type.startswith('reference ') or field_type.startswith('list:integer') or @@ -2046,6 +2040,13 @@ class SQLFORM(FORM): _type='text', _id=_id, _class="%s %s" % ((field_type or ''), 'form-control')) + if hasattr(field.requires, 'options'): + value_input = SELECT( + *[OPTION(v, _value=k) + for k, v in field.requires.options()], + _class='form-control', + **dict(_id=_id)) + new_button = INPUT( _type="button", _value=T('New Search'), _class="btn btn-default", _title=T('Start building a new search'), _onclick="%s_build_query('new','%s')" % (prefix, field))