Merge pull request #65 from kregoslup/all-objects-bug

All objects bug - need check if self.field.remote_field.model has `all_objects` attribute

django_permanent/related.py

@@ -62,9 +62,12 @@ def wrapper(self, **hints):
             instance = hints.get('instance')
             if instance and isinstance(instance, PermanentModel) and getattr(instance, settings.FIELD):
                 if django.VERSION < (1, 9, 0):
-                    return self.field.rel.to.all_objects
+                    model = self.field.rel.to
                 else:
-                    return self.field.remote_field.model.all_objects
+                    model = self.field.remote_field.model
+                if hasattr(model, 'all_objects'):
+                    return model.all_objects
+                return model.objects
             return func(self, **hints)
         return wrapper
 

django_permanent/tests/cases.py

@@ -7,6 +7,7 @@
 from django.test import TestCase
 from django.utils.timezone import now
 
+from django_permanent.tests.test_app.models import RegularModel, RemovableRegularDepended
 from .test_app.models import (
     CustomQsPermanent,
     M2MFrom,
@@ -62,6 +63,15 @@ def test_removable_nullable_depended(self):
         depended = model.objects.first()
         self.assertEqual(depended.dependence, None)
 
+    def test_remove_removable_nullable_depended(self):
+        model = RemovableRegularDepended
+        test_model = model.objects.create(dependence=RegularModel.objects.create(name='Test'))
+        test_model.delete()
+        try:
+            self.assertIsNotNone(model.deleted_objects.first().dependence)
+        except AttributeError:
+            self.fail()
+
     def test_permanent_depended(self):
         model = PermanentDepended
         depended = model.objects.create(dependence=self.permanent)

django_permanent/tests/test_app/models.py

@@ -19,6 +19,15 @@ class MyPermanentModel(PermanentModel, BaseTestModel):
     pass
 
 
+class RegularModel(BaseTestModel):
+    name = models.CharField(max_length=255, blank=True, null=True)
+    pass
+
+
+class RemovableRegularDepended(PermanentModel, BaseTestModel):
+    dependence = models.ForeignKey(RegularModel, on_delete=models.CASCADE)
+
+
 class RemovableDepended(BaseTestModel):
     dependence = models.ForeignKey(MyPermanentModel, on_delete=models.CASCADE)