From 0cd444be6b5dc6d42789fbaa4e9f89137d047f11 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Sun, 17 Dec 2017 20:27:19 +0000 Subject: [PATCH] django-reversion >= 2.0.0 should be used with django >= 1.8 https://django-reversion.readthedocs.io/en/stable/django-versions.html --- modoboa/core/handlers.py | 5 +++-- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modoboa/core/handlers.py b/modoboa/core/handlers.py index 6f6c43649..d3d78e2ce 100644 --- a/modoboa/core/handlers.py +++ b/modoboa/core/handlers.py @@ -13,6 +13,7 @@ from django.utils.translation import ugettext as _ from django.contrib.sites import models as sites_models from reversion import revisions as reversion +from reversion.models import Version from modoboa.lib import exceptions from modoboa.lib import permissions @@ -39,7 +40,7 @@ def post_revision_commit(sender, **kwargs): for version in kwargs["versions"]: if version.object is None: continue - prev_revisions = reversion.get_for_object(version.object) + prev_revisions = Version.objects.get_for_object(version.object) if prev_revisions.count() == 1: action = _("added") level = "info" @@ -64,7 +65,7 @@ def log_object_removal(sender, instance, **kwargs): if not reversion.is_registered(sender): return - del_list = reversion.get_deleted(sender) + del_list = Version.objects.get_deleted(sender) try: version = del_list.get(object_id=instance.id) except Version.DoesNotExist: diff --git a/requirements.txt b/requirements.txt index b66931b09..25251f92b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ django>=1.10,<=1.10.99 django-braces==1.11.0 django-ckeditor==5.2.1 -django-reversion==1.10.2 +django-reversion==2.0.12 django-subcommand2==0.1.1 django-versionfield2>=0.5.0 django-xforwardedfor-middleware