From e929659d64a0e68e3ebcc5b3c13d80f87d986e4b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 15 Jul 2012 18:06:49 -0500 Subject: [PATCH] db().select(....) no longer ignores common_filters, issue 893 --- VERSION | 2 +- gluon/dal.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 19952e58..79aaa7c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-15 17:32:22) dev +Version 2.00.0 (2012-07-15 18:06:45) dev diff --git a/gluon/dal.py b/gluon/dal.py index ef2bb097..e0ff9295 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8310,6 +8310,8 @@ class Set(object): return self.db._adapter.count(self.query,distinct) def select(self, *fields, **attributes): + if self.query is None:# and fields[0]._table._common_filter != None: + return self(fields[0]._table).select(*fields,**attributes) adapter = self.db._adapter fields = adapter.expand_all(fields, adapter.tables(self.query)) return adapter.select(self.query,fields,attributes)