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

Merge pull request #1349 from zvolsky/_represent_none

Browse Source 
represent none
This commit is contained in:
mdipierro
2016-06-07 20:36:01 -05:00
parent 154073c3a6 876508a227
commit df9928d69c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+8 -1
View File
@@ -2041,7 +2041,8 @@ class SQLFORM(FORM):
client_side_delete=False, client_side_delete=False,
ignore_common_filters=None, ignore_common_filters=None,
auto_pagination=True, auto_pagination=True,
use_cursor=False): use_cursor=False,
represent_none=None):
formstyle = formstyle or current.response.formstyle formstyle = formstyle or current.response.formstyle
if isinstance(query, Set): if isinstance(query, Set):
@@ -2317,6 +2318,10 @@ class SQLFORM(FORM):
elif details and request.args(-3) == 'view': elif details and request.args(-3) == 'view':
table = db[request.args[-2]] table = db[request.args[-2]]
record = table(request.args[-1]) or redirect(referrer) record = table(request.args[-1]) or redirect(referrer)
if represent_none is not None:
for field in record.iterkeys():
if record[field] is None:
record[field] = represent_none
sqlformargs = dict(upload=upload, ignore_rw=ignore_rw, sqlformargs = dict(upload=upload, ignore_rw=ignore_rw,
formstyle=formstyle, readonly=True, formstyle=formstyle, readonly=True,
_class='web2py_form') _class='web2py_form')
@@ -2789,6 +2794,8 @@ class SQLFORM(FORM):
value = truncate_string(value, maxlength) value = truncate_string(value, maxlength)
elif not isinstance(value, XmlComponent): elif not isinstance(value, XmlComponent):
value = field.formatter(value) value = field.formatter(value)
if value is None:
value = represent_none
trcols.append(TD(value)) trcols.append(TD(value))
row_buttons = TD(_class='row_buttons', _nowrap=True) row_buttons = TD(_class='row_buttons', _nowrap=True)
if links and links_in_grid: if links and links_in_grid: