Merge 76757b5 into 44c7b4b

.gitignore

@@ -57,3 +57,6 @@ docs/_build/
 
 # Vim
 *.sw[op]
+
+# Pycharm
+.idea

autoslug/fields.py

@@ -207,6 +207,7 @@ def __init__(self, *args, **kwargs):
         # When using model inheritence, set manager to search for matching
         # slug values
         self.manager = kwargs.pop('manager', None)
+        self.manager_name = kwargs.pop('manager_name', None)
 
         self.always_update = kwargs.pop('always_update', False)
         super(SlugField, self).__init__(*args, **kwargs)
@@ -237,6 +238,9 @@ def deconstruct(self):
         if self.manager is not None:
             kwargs['manager'] = self.manager
 
+        if self.manager_name is not None:
+            kwargs['manager_name'] = self.manager_name
+
         if self.always_update:
             kwargs['always_update'] = self.always_update
 
@@ -247,7 +251,12 @@ def pre_save(self, instance, add):
         # get currently entered slug
         value = self.value_from_object(instance)
 
-        manager = self.manager
+        if self.manager is not None:
+            manager = self.manager
+        elif self.manager_name is not None:
+            manager = getattr(self.model, self.manager_name)
+        else:
+            manager = None
 
         # autopopulate
         if self.always_update or (self.populate_from and not value):

autoslug/tests/models.py

@@ -1,4 +1,4 @@
-from django.db.models import Model, CharField, DateField, ForeignKey, Manager
+from django.db.models import Model, CharField, DateField, BooleanField, ForeignKey, Manager
 
 
 # this app
@@ -27,7 +27,7 @@ class ModelWithUniqueSlugDate(Model):
     slug = AutoSlugField(unique_with='date')
 
 
-class ModelWithUniqueSlugDay(Model):    # same as ...Date, just more explicit
+class ModelWithUniqueSlugDay(Model):  # same as ...Date, just more explicit
     date = DateField()
     slug = AutoSlugField(unique_with='date__day')
 
@@ -82,6 +82,8 @@ class ModelWithCustomPrimaryKey(Model):
 
 
 custom_slugify = lambda value: default_slugify(value).replace('-', '_')
+
+
 class ModelWithCustomSlugifier(Model):
     slug = AutoSlugField(unique=True, slugify=custom_slugify)
 
@@ -144,3 +146,27 @@ class ModeltranslationOne(Model):
     title = CharField(max_length=255)
     description = CharField(max_length=255)
     slug = AutoSlugField(populate_from='title', always_update=True, unique=True)
+
+
+class NonDeletedObjects(Manager):
+    def get_queryset(self):
+        return super(NonDeletedObjects, self).get_queryset().filter(is_deleted=False)
+
+
+class AbstractModelWithCustomManager(Model):
+    is_deleted = BooleanField(default=False)
+
+    objects = NonDeletedObjects()
+    all_objects = Manager()
+
+    class Meta:
+        abstract = True
+
+    def delete(self, using=None):
+        self.is_deleted = True
+        self.save()
+
+
+class NonDeletableModelWithUniqueSlug(AbstractModelWithCustomManager):
+    name = CharField(max_length=200)
+    slug = AutoSlugField(populate_from='name', unique=True, manager_name='all_objects')

autoslug/tests/tests.py

@@ -234,6 +234,13 @@ def test_shared_slug_space(self):
         b.save()
         assert b.slug == u'my-name-2'
 
+    def test_autoslug_with_manager_name(self):
+        a = NonDeletableModelWithUniqueSlug.objects.create(name='My name')
+        self.assertEqual(a.slug, u'my-name')
+        a.delete()
+        b = NonDeletableModelWithUniqueSlug.objects.create(name='My name')
+        self.assertEqual(b.slug, u'my-name-2')
+
 
 class AutoSlugModelTranslationTestCase(TestCase):