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

fixed a problem with grid

Browse Source
This commit is contained in:
mdipierro
2013-10-04 14:56:16 -05:00
parent 72a7643cde
commit 700fd846a8
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+10 -3
View File
@@ -1,9 +1,16 @@
## 2.7.1 ## 2.7.1
- jQuery 1.10.2 - jQuery 1.10.2
- Namespaces in translator T("Welcome", ns="namespace"), thanks jamarcer - codemirror 3.18, thanks Paolo
- More Auth options, thanks Charles - namespaces in T("Welcome", ns="namespace"), thanks jamarcer (experimental)
- More Admin configuration, thanks Roberto - more Auth options, thanks Charles
- more admin configuration, thanks Roberto
- new gluon.contrib.strip.StripeForm for PCI compliant payments
- webclient can hendle lists, thanks Yair
- allows SQLFORM.grid(...,ignore_common_filters=True)
- more translations, thanks Vladyslav
- better session2trash.py, works with scheduler, thanks niphlod
- fixed problem with ENABLED/DISABLED
## 2.6.1 - 2.6.4 ## 2.6.1 - 2.6.4
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.4-stable+timestamp.2013.10.04.14.40.29 Version 2.6.4-stable+timestamp.2013.10.04.14.55.34
applications/admin/models/0.py
+2 -1
View File
@@ -9,7 +9,8 @@ WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'
# browser. # browser.
## Default editor (to change editor you need web2py.admin.editors.zip) ## Default editor (to change editor you need web2py.admin.editors.zip)
TEXT_EDITOR = 'codemirror' or 'ace' or 'edit_area' or 'amy' ## old editors like 'ace' or 'edit_area' or 'amy' are no longer supported
TEXT_EDITOR = 'codemirror'
## Editor Color scheme (only for ace) ## Editor Color scheme (only for ace)
TEXT_EDITOR_THEME = ( TEXT_EDITOR_THEME = (
gluon/sqlhtml.py
+9 -8
View File
@@ -1922,14 +1922,15 @@ class SQLFORM(FORM):
columns = [] columns = []
for table in tables: for table in tables:
for k,f in table.iteritems(): for k,f in table.iteritems():
if isinstance(f,Field): if not k.startswith('_'):
fields.append(f) # these are selected if isinstance(f,Field):
if f.readable: fields.append(f) # these are selected
columns.append(f) # these are displayed/exported if f.readable:
elif isinstance(f,Field.Virtual) and f.readable: columns.append(f) # these are displayed
f.tablename = table._tablename elif isinstance(f,Field.Virtual) and f.readable:
columns.append(f) f.tablename = table._tablename
fields.append(f) columns.append(f)
fields.append(f)
if not field_id: if not field_id:
if groupby is None: if groupby is None: