Compatibility with reversion >= 1.8.

fixes #497

modoboa/core/commands/templates/settings.py.tpl

@@ -106,6 +106,7 @@ TEMPLATE_LOADERS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.transaction.TransactionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -154,8 +155,8 @@ MODOBOA_APPS = (
     'modoboa.lib',
     # Modoboa extensions here.
     'modoboa.extensions.admin',
-    'modoboa.extensions.limits',
     'modoboa.extensions.postfix_relay_domains',
+    'modoboa.extensions.limits',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
     'modoboa.extensions.stats',

modoboa/core/extensions.py

@@ -76,11 +76,13 @@ class ExtensionsPool(object):
         """
         from modoboa.core.models import Extension
 
+        result = []
         for ext in settings.MODOBOA_APPS:
             __import__(ext)
-        result = []
-        for extname in self.extensions.keys():
+            extname = ext.split('.')[-1]
             extinstance = self.get_extension(extname)
+            if extinstance is None:
+                continue
             try:
                 baseurl = extinstance.url \
                     if extinstance.url is not None else extname
@@ -106,7 +108,7 @@ class ExtensionsPool(object):
         for extname, extdef in self.extensions.iteritems():
             if not extdef["show"]:
                 continue
-            infos = extdef["instance"].infos()
+            infos = self.get_extension_infos(extname)
             infos["id"] = extname
             result += [infos]
         return sorted(result, key=lambda i: i["name"])

modoboa/core/models.py

@@ -4,9 +4,11 @@ import re
 import hashlib
 import crypt
 import base64
+import logging
 from random import Random
 import reversion
 from django.db import models
+from django.db.models.signals import post_delete
 from django.dispatch import receiver
 from django.utils import timezone
 from django.utils.translation import ugettext as _, ugettext_lazy
@@ -463,24 +465,44 @@ class Log(models.Model):
 
 @receiver(reversion.post_revision_commit)
 def post_revision_commit(sender, **kwargs):
-    import logging
-
     if kwargs["revision"].user is None:
         return
     logger = logging.getLogger("modoboa.admin")
     for version in kwargs["versions"]:
-        if version.type == reversion.models.VERSION_ADD:
+        prev_revisions = reversion.get_for_object(version.object)
+        if prev_revisions.count() == 1:
             action = _("added")
             level = "info"
-        elif version.type == reversion.models.VERSION_CHANGE:
+        else:
             action = _("modified")
             level = "warning"
-        else:
-            action = _("deleted")
-            level = "critical"
         message = _("%(object)s '%(name)s' %(action)s by user %(user)s") % {
             "object": unicode(version.content_type).capitalize(),
             "name": version.object_repr, "action": action,
             "user": kwargs["revision"].user.username
         }
         getattr(logger, level)(message)
+
+
+@receiver(post_delete)
+def post_delete_hook(sender, instance, **kwargs):
+    """Custom post-delete hook.
+
+    We want to know who was responsible for an object deletion.
+    """
+    from reversion.models import Version
+
+    if not reversion.is_registered(sender):
+        return
+    del_list = reversion.get_deleted(sender)
+    try:
+        version = del_list.get(object_id=instance.id)
+    except Version.DoesNotExist:
+        return
+    logger = logging.getLogger("modoboa.admin")
+    msg = _("%(object)s '%(name)s' %(action)s by user %(user)s") % {
+        "object": unicode(version.content_type).capitalize(),
+        "name": version.object_repr, "action": _("deleted"),
+        "user": version.revision.user.username
+    }
+    logger.critical(msg)

modoboa/core/templatetags/core_tags.py

@@ -45,7 +45,7 @@ def settings_menu(selection, user):
          "label": _("Information")},
         {"name": "logs",
          "class": "ajaxlink",
-         "url": "logs/",
+         "url": "logs/&sort_order=-date_created",
          "label": _("Logs")},
         {"name": "parameters",
          "class": "ajaxlink",