diff --git a/VERSION b/VERSION index 63d32361..232414f3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.31.11.24.32 +Version 2.6.0-development+timestamp.2013.07.31.11.44.33 diff --git a/gluon/dal.py b/gluon/dal.py index 211ff2d5..29714a33 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8369,6 +8369,7 @@ class Table(object): db = self._db pr = db._pending_references self._referenced_by = [] + self._references = [] for field in self: fieldname = field.name field_type = field.type @@ -8397,11 +8398,12 @@ class Table(object): rfield = rtable._id rtable._referenced_by.append(field) field.referent = rfield + self._references.append(field) else: field.referent = None for referee in pr.get(self._tablename,[]): self._referenced_by.append(referee) - + def _filter_fields(self, record, id=False): return dict([(k, v) for (k, v) in record.iteritems() if k in self.fields and (self[k].type!='id' or id)])