fix collect_sub_objects

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / base.py

diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py
index bc6ca92e8c34e1a57a0ae046e3183669927d7ca9..661c2eda2593ae45bb0f91960d7e9f398d0cf7a6 100644 (file)
--- 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
 
         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
         """
         """
         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):
         """
 
     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))
 
         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):
         """
     @classmethod
     def scoped(base_class, base_dn):
         """