dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IS_IN_DB ignoring common filters, thanks tsvim

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-03-01 11:02:23 -06:00
parent 42e5bea36f
commit a8a4fee635
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-03-01 09:12:01) stable Version 1.99.4 (2012-03-01 11:01:59) stable
gluon/validators.py
+7 -5
View File
@@ -440,19 +440,21 @@ class IS_IN_DB(Validator):
self._and.record_id = id self._and.record_id = id
def build_set(self): def build_set(self):
table = self.dbset.db[self.ktable]
if self.fields == 'all': if self.fields == 'all':
fields = [f for f in self.dbset.db[self.ktable]] fields = [f for f in table]
else: else:
fields = [self.dbset.db[self.ktable][k] for k in self.fields] fields = [table[k] for k in self.fields]
if self.dbset.db._dbname != 'gae': if self.dbset.db._dbname != 'gae':
orderby = self.orderby or reduce(lambda a,b:a|b,fields) orderby = self.orderby or reduce(lambda a,b:a|b,fields)
groupby = self.groupby groupby = self.groupby
dd = dict(orderby=orderby, groupby=groupby, cache=self.cache) dd = dict(orderby=orderby, groupby=groupby, cache=self.cache)
records = self.dbset.select(*fields, **dd) records = self.dbset(table).select(*fields, **dd)
else: else:
orderby = self.orderby or reduce(lambda a,b:a|b,(f for f in fields if not f.name=='id')) orderby = self.orderby or \
reduce(lambda a,b:a|b,(f for f in fields if not f.name=='id'))
dd = dict(orderby=orderby, cache=self.cache) dd = dict(orderby=orderby, cache=self.cache)
records = self.dbset.select(self.dbset.db[self.ktable].ALL, **dd) records = self.dbset(table).select(table.ALL, **dd)
self.theset = [str(r[self.kfield]) for r in records] self.theset = [str(r[self.kfield]) for r in records]
if isinstance(self.label,str): if isinstance(self.label,str):
self.labels = [self.label % dict(r) for r in records] self.labels = [self.label % dict(r) for r in records]