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

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2015-01-26 09:22:47 -06:00
parent 554722318a c18e32134c
commit 89c5668366
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+4 -4
View File
@@ -3199,13 +3199,13 @@ class SQLTABLE(TABLE):
r = '' r = ''
elif field.type in ['string', 'text']: elif field.type in ['string', 'text']:
r = str(field.formatter(r)) r = str(field.formatter(r))
truncate_by = truncate
if headers != {}: # new implement dict if headers != {}: # new implement dict
if isinstance(headers[colname], dict): if isinstance(headers[colname], dict):
if isinstance(headers[colname]['truncate'], int): if isinstance(headers[colname]['truncate'], int):
r = truncate_string( truncate_by = headers[colname]['truncate']
r, headers[colname]['truncate']) if not truncate_by is None:
elif not truncate is None: r = truncate_string(r, truncate_by)
r = truncate_string(r, truncate)
attrcol = dict() # new implement dict attrcol = dict() # new implement dict
if headers != {}: if headers != {}:
if isinstance(headers[colname], dict): if isinstance(headers[colname], dict):