fixup

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

diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py
index 3c15151ba53fe154234e535b52a3ff594e142982..a0ade49ea87d631cac2eb089685b48d65ca9b6c9 100644 (file)
--- a/ldapdb/models/base.py
+++ b/ldapdb/models/base.py
@@ -40,10 +40,11 @@ class ModelBase(django.db.models.base.ModelBase):
         new_class = super_new(cls, name, bases, attrs)
 
         # patch manager to use our own QuerySet class
-        def get_query_set():
-            return QuerySet(new_class)
-        new_class.objects.get_query_set = get_query_set
-        new_class._default_manager.get_query_set = get_query_set
+        if not new_class._meta.abstract:
+            def get_query_set():
+                return QuerySet(new_class)
+            new_class.objects.get_query_set = get_query_set
+            new_class._default_manager.get_query_set = get_query_set
 
         if attr_meta:
             new_class._meta.dn = attr_meta.dn
@@ -59,6 +60,10 @@ class Model(django.db.models.base.Model):
 
     dn = django.db.models.fields.CharField(max_length=200)
 
+    # meta-data
+    base_dn = None
+    object_classes = ['top']
+
     def __init__(self, *args, **kwargs):
         super(Model, self).__init__(*args, **kwargs)
         self.saved_pk = self.pk
@@ -79,7 +84,7 @@ class Model(django.db.models.base.Model):
         """
         Build the Distinguished Name for this entry.
         """
-        return "%s,%s" % (self.build_rdn(), self._meta.dn)
+        return "%s,%s" % (self.build_rdn(), self.base_dn)
         raise Exception("Could not build Distinguished Name")
 
     def delete(self):
@@ -94,7 +99,7 @@ class Model(django.db.models.base.Model):
         if not self.dn:
             # create a new entry
             record_exists = False 
-            entry = [('objectClass', self._meta.object_classes)]
+            entry = [('objectClass', self.object_classes)]
             new_dn = self.build_dn()
 
             for field in self._meta.local_fields:
@@ -143,3 +148,15 @@ 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))
 
+    @classmethod
+    def scoped(base_class, base_dn):
+        """
+        Returns a copy of the current class with a different base_dn.
+        """
+        import new
+        import re
+        suffix = re.sub('[=,]', '_', base_dn)
+        name = "%s_%s" % (base_class.__name__, str(suffix))
+        new_class = new.classobj(name, (base_class,), {'base_dn': base_dn, '__module__': base_class.__module__})
+        return new_class
+