fixed a problem with grid

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
+10 -3
View File
@@ -1,9 +1,16 @@
## 2.7.1
- jQuery 1.10.2
- Namespaces in translator T("Welcome", ns="namespace"), thanks jamarcer
- More Auth options, thanks Charles
- More Admin configuration, thanks Roberto
- codemirror 3.18, thanks Paolo
- namespaces in T("Welcome", ns="namespace"), thanks jamarcer (experimental)
- 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
+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
+2 -1
View File
@@ -9,7 +9,8 @@ WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'
# browser.
## 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)
TEXT_EDITOR_THEME = (
+9 -8
View File
@@ -1922,14 +1922,15 @@ class SQLFORM(FORM):
columns = []
for table in tables:
for k,f in table.iteritems():
if isinstance(f,Field):
fields.append(f) # these are selected
if f.readable:
columns.append(f) # these are displayed/exported
elif isinstance(f,Field.Virtual) and f.readable:
f.tablename = table._tablename
columns.append(f)
fields.append(f)
if not k.startswith('_'):
if isinstance(f,Field):
fields.append(f) # these are selected
if f.readable:
columns.append(f) # these are displayed
elif isinstance(f,Field.Virtual) and f.readable:
f.tablename = table._tablename
columns.append(f)
fields.append(f)
if not field_id:
if groupby is None: