From 700fd846a833b8eb2ee50c94dfcbd9380220d953 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 4 Oct 2013 14:56:16 -0500
Subject: [PATCH] fixed a problem with grid

---
 CHANGELOG                      | 13 ++++++++++---
 VERSION                        |  2 +-
 applications/admin/models/0.py |  3 ++-
 gluon/sqlhtml.py               | 17 +++++++++--------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a8ed5043..508c70eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 
diff --git a/VERSION b/VERSION
index cecfebc4..eb452974 100644
--- a/VERSION
+++ b/VERSION
@@ -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
diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py
index be8fe37a..340ae14c 100644
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -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 = (
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 0195d3b3..1aaa2d29 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -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: