From 8dbf2719ef0a259ec9f1f95ed1506cc1aea234bb Mon Sep 17 00:00:00 2001
From: Jirka Vejrazka <Jirka.Vejrazka@gmail.com>
Date: Sat, 6 Feb 2021 21:23:47 +0100
Subject: [PATCH 1/2] Fix for Issue 175 (possible exception with custom
managers hiding some model instances)
---
easyaudit/signals/model_signals.py | 2 +-
easyaudit/tests/test_app/models.py | 12 ++++++++++++
easyaudit/tests/test_app/tests.py | 17 ++++++++++++++++-
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/easyaudit/signals/model_signals.py b/easyaudit/signals/model_signals.py
index a4ac1c2d..20562763 100644
--- a/easyaudit/signals/model_signals.py
+++ b/easyaudit/signals/model_signals.py
@@ -68,7 +68,7 @@ def pre_save(sender, instance, raw, using, update_fields, **kwargs):
# created or updated?
if not created:
- old_model = sender.objects.get(pk=instance.pk)
+ old_model = sender._default_manager.get(pk=instance.pk)
delta = model_delta(old_model, instance)
if not delta and getattr(settings, "DJANGO_EASY_AUDIT_CRUD_EVENT_NO_CHANGED_FIELDS_SKIP", False):
return False
diff --git a/easyaudit/tests/test_app/models.py b/easyaudit/tests/test_app/models.py
index 519306c1..7e625cc9 100644
--- a/easyaudit/tests/test_app/models.py
+++ b/easyaudit/tests/test_app/models.py
@@ -55,3 +55,15 @@ class TestBigIntM2M(models.Model):
id = models.BigAutoField(primary_key=True)
name = models.CharField(max_length=50)
test_m2m = models.ManyToManyField(TestBigIntModel)
+
+class SoftDeleteManager(models.Manager):
+ def get_queryset(self):
+ return super().get_queryset().exclude(deleted=True)
+
+class TestSoftDeleteModel(models.Model):
+ id = models.BigAutoField(primary_key=True)
+ deleted = models.BooleanField(default=False)
+ some_other_field = models.CharField(max_length=50, default='')
+
+ all_objects = models.Manager()
+ objects = SoftDeleteManager()
diff --git a/easyaudit/tests/test_app/tests.py b/easyaudit/tests/test_app/tests.py
index c10267ab..27621368 100644
--- a/easyaudit/tests/test_app/tests.py
+++ b/easyaudit/tests/test_app/tests.py
@@ -18,7 +18,8 @@
from test_app.models import (
TestModel, TestForeignKey, TestM2M,
TestBigIntModel, TestBigIntForeignKey, TestBigIntM2M,
- TestUUIDModel, TestUUIDForeignKey, TestUUIDM2M
+ TestUUIDModel, TestUUIDForeignKey, TestUUIDM2M,
+ TestSoftDeleteModel
)
from easyaudit.models import CRUDEvent, RequestEvent
from easyaudit.middleware.easyaudit import set_current_user, clear_request
@@ -278,3 +279,17 @@ def test_request_event_admin_no_users(self):
response = self.client.get(reverse('admin:easyaudit_requestevent_changelist'))
self.assertEqual(200, response.status_code)
filters = self._list_filters(response.content)
+
+@override_settings(TEST=True)
+class TestCustomManager(TestCase):
+ Model = TestSoftDeleteModel
+
+ def test_soft_delete_model(self):
+ obj = self.Model.objects.create(deleted=True)
+ crud_event_qs = CRUDEvent.objects.filter(object_id=obj.id, content_type=ContentType.objects.get_for_model(obj))
+ self.assertEqual(1, crud_event_qs.count())
+
+ obj.some_other_field = 'this should not fail'
+ obj.save()
+ crud_event_qs = CRUDEvent.objects.filter(object_id=obj.id, content_type=ContentType.objects.get_for_model(obj))
+ self.assertEqual(2, crud_event_qs.count())
From 10d6f2217069dd04354ed8ae723b763e4a1d3098 Mon Sep 17 00:00:00 2001
From: Jirka Vejrazka <Jirka.Vejrazka@gmail.com>
Date: Sat, 6 Feb 2021 21:26:39 +0100
Subject: [PATCH 2/2] Added forgotten migration file
---
.../migrations/0004_testsoftdeletemodel.py | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 easyaudit/tests/test_app/migrations/0004_testsoftdeletemodel.py
diff --git a/easyaudit/tests/test_app/migrations/0004_testsoftdeletemodel.py b/easyaudit/tests/test_app/migrations/0004_testsoftdeletemodel.py
new file mode 100644
index 00000000..fe6c6e0c
--- /dev/null
+++ b/easyaudit/tests/test_app/migrations/0004_testsoftdeletemodel.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2 on 2021-02-06 20:15
+
+from django.db import migrations, models
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('test_app', '0003_testbigintforeignkey_testbigintm2m_testbigintmodel_testuuidforeignkey_testuuidm2m_testuuidmodel'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='TestSoftDeleteModel',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('deleted', models.BooleanField(default=False)),
+ ('some_other_field', models.CharField(default='', max_length=50)),
+ ],
+ managers=[
+ ('all_objects', django.db.models.manager.Manager()),
+ ],
+ ),
+ ]