X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fbase.py;h=661c2eda2593ae45bb0f91960d7e9f398d0cf7a6;hp=bc6ca92e8c34e1a57a0ae046e3183669927d7ca9;hb=8aafb73e2347febe83c7760a72d10976cc0a35f3;hpb=629356eed3430e528274c5a54c5291037bc0d985 diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py index bc6ca92..661c2ed 100644 --- a/ldapdb/models/base.py +++ b/ldapdb/models/base.py @@ -75,11 +75,13 @@ class Model(django.db.models.base.Model): super(Model, self).__init__(*args, **kwargs) self.saved_pk = self.pk - def _collect_sub_objects(self, collector): + def _collect_sub_objects(self, seen_objs, parent=None, nullable=False): """ This private API seems to be called by the admin interface in django 1.2 """ - pass + pk_val = self._get_pk_val() + seen_objs.add(self.__class__, pk_val, self, + type(parent), parent, nullable) def build_rdn(self): """ @@ -161,11 +163,6 @@ class Model(django.db.models.base.Model): self.saved_pk = self.pk signals.post_save.send(sender=self.__class__, instance=self, created=(not record_exists)) - def validate_unique(self, exclude=None): - # FIXME: we are bypassing the unicity checks, as they break - # the admin interface - pass - @classmethod def scoped(base_class, base_dn): """