Merge pull request #585 from ilvalle/issue2023

fix issue 2023: common_filter issue in _enable_record_versioning
2015-01-10 20:40:26 -06:00
parent 9e555ed4b5 c5c5b5708e
commit e9de0766bc
1 changed files with 3 additions and 2 deletions
@@ -428,8 +428,9 @@ class Table(object):
                            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()