dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1325 from gi0baro/issue-1324

Browse Source 
Fix #1324
This commit is contained in:
mdipierro
2016-05-11 01:35:30 -05:00
parent cda35fd48a 625c7ae82e
commit 32ac20c1c5
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+18 -18
View File
@@ -110,19 +110,19 @@ def show_if(cond):
if not cond: if not cond:
return None return None
base = "%s_%s" % (cond.first.tablename, cond.first.name) base = "%s_%s" % (cond.first.tablename, cond.first.name)
if ((cond.op.__name__ == 'EQ' and cond.second is True) or if ((cond.op.__name__ == 'eq' and cond.second is True) or
(cond.op.__name__ == 'NE' and cond.second is False)): (cond.op.__name__ == 'ne' and cond.second is False)):
return base, ":checked" return base, ":checked"
if ((cond.op.__name__ == 'EQ' and cond.second is False) or if ((cond.op.__name__ == 'eq' and cond.second is False) or
(cond.op.__name__ == 'NE' and cond.second is True)): (cond.op.__name__ == 'ne' and cond.second is True)):
return base, ":not(:checked)" return base, ":not(:checked)"
if cond.op.__name__ == 'EQ': if cond.op.__name__ == 'eq':
return base, "[value='%s']" % cond.second return base, "[value='%s']" % cond.second
if cond.op.__name__ == 'NE': if cond.op.__name__ == 'ne':
return base, "[value!='%s']" % cond.second return base, "[value!='%s']" % cond.second
if cond.op.__name__ == 'CONTAINS': if cond.op.__name__ == 'contains':
return base, "[value~='%s']" % cond.second return base, "[value~='%s']" % cond.second
if cond.op.__name__ == 'BELONGS': if cond.op.__name__ == 'belongs':
if isinstance(cond.second, set): if isinstance(cond.second, set):
cond.second = list(cond.second) cond.second = list(cond.second)
if isinstance(cond.second, (list, tuple)): if isinstance(cond.second, (list, tuple)):
@@ -1528,7 +1528,7 @@ class SQLFORM(FORM):
hideerror=hideerror, hideerror=hideerror,
**kwargs **kwargs
) )
self.deleted = request_vars.get(self.FIELDNAME_REQUEST_DELETE, False) self.deleted = request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)
self.custom.end = CAT(self.hidden_fields(), self.custom.end) self.custom.end = CAT(self.hidden_fields(), self.custom.end)
@@ -1897,24 +1897,24 @@ class SQLFORM(FORM):
else: else:
field_type = field.type field_type = field.type
operators = SELECT(*[OPTION(T(option), _value=option) for option in options], operators = SELECT(*[OPTION(T(option), _value=option) for option in options],
_class='form-control') _class='form-control')
_id = "%s_%s" % (value_id, name) _id = "%s_%s" % (value_id, name)
if field_type in ['boolean', 'double', 'time', 'integer']: if field_type in ['boolean', 'double', 'time', 'integer']:
widget_ = SQLFORM.widgets[field_type] widget_ = SQLFORM.widgets[field_type]
value_input = widget_.widget(field, field.default, _id=_id, value_input = widget_.widget(field, field.default, _id=_id,
_class=widget_._class + ' form-control') _class=widget_._class + ' form-control')
elif field_type == 'date': elif field_type == 'date':
iso_format = {'_data-w2p_date_format': '%Y-%m-%d'} iso_format = {'_data-w2p_date_format': '%Y-%m-%d'}
widget_ = SQLFORM.widgets.date widget_ = SQLFORM.widgets.date
value_input = widget_.widget(field, field.default, _id=_id, value_input = widget_.widget(field, field.default, _id=_id,
_class=widget_._class + ' form-control', _class=widget_._class + ' form-control',
**iso_format) **iso_format)
elif field_type == 'datetime': elif field_type == 'datetime':
iso_format = {'_data-w2p_datetime_format': '%Y-%m-%d %H:%M:%S'} iso_format = {'_data-w2p_datetime_format': '%Y-%m-%d %H:%M:%S'}
widget_ = SQLFORM.widgets.datetime widget_ = SQLFORM.widgets.datetime
value_input = widget_.widget(field, field.default, _id=_id, value_input = widget_.widget(field, field.default, _id=_id,
_class=widget_._class + ' form-control', _class=widget_._class + ' form-control',
**iso_format) **iso_format)
elif hasattr(field.requires, 'options'): elif hasattr(field.requires, 'options'):
value_input = SELECT( value_input = SELECT(
@@ -1928,7 +1928,7 @@ class SQLFORM(FORM):
field_type.startswith('list:reference ')): field_type.startswith('list:reference ')):
widget_ = SQLFORM.widgets.integer widget_ = SQLFORM.widgets.integer
value_input = widget_.widget( value_input = widget_.widget(
field, field.default, _id=_id, field, field.default, _id=_id,
_class=widget_._class + ' form-control') _class=widget_._class + ' form-control')
else: else:
value_input = INPUT( value_input = INPUT(
@@ -2044,7 +2044,7 @@ class SQLFORM(FORM):
use_cursor=False): use_cursor=False):
formstyle = formstyle or current.response.formstyle formstyle = formstyle or current.response.formstyle
if isinstance(query, Set): if isinstance(query, Set):
query = query.query query = query.query
# jQuery UI ThemeRoller classes (empty if ui is disabled) # jQuery UI ThemeRoller classes (empty if ui is disabled)
@@ -3043,7 +3043,7 @@ class SQLFORM(FORM):
query = query & constraints[table._tablename] query = query & constraints[table._tablename]
if isinstance(links, dict): if isinstance(links, dict):
links = links.get(table._tablename, []) links = links.get(table._tablename, [])
for key in ('fields', 'field_id', 'left', 'headers', 'orderby', 'groupby', 'searchable', for key in ('fields', 'field_id', 'left', 'headers', 'orderby', 'groupby', 'searchable',
'sortable', 'paginate', 'deletable', 'editable', 'details', 'selectable', 'sortable', 'paginate', 'deletable', 'editable', 'details', 'selectable',
'create', 'csv', 'links', 'links_in_grid', 'upload', 'maxtextlengths', 'create', 'csv', 'links', 'links_in_grid', 'upload', 'maxtextlengths',
'maxtextlength', 'onvalidation', 'onfailure', 'oncreate', 'onupdate', 'maxtextlength', 'onvalidation', 'onfailure', 'oncreate', 'onupdate',