Merge pull request #585 from ilvalle/issue2023

fix issue 2023: common_filter issue in _enable_record_versioning
web2py · Jan 11, 2015 · e9de076 · e9de076
2 parents 9e555ed + c5c5b57
commit e9de076
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/gluon/dal/objects.py b/gluon/dal/objects.py
@@ -428,8 +428,9 @@ def _enable_record_versioning(self,
                             if tn == name or getattr(db[tn],'_ot',None)==name])
             query = self._common_filter
             if query:
-                newquery = query & newquery
-            self._common_filter = newquery
+                self._common_filter = lambda q: reduce(AND, [query(q), newquery(q)])
+            else:
+                self._common_filter = newquery
 
     def _validate(self, **vars):
         errors = Row()