Merge branch 'fix-model-versioning'

aleksis/core/mixins.py

@@ -17,8 +17,25 @@ from material.base import Layout, LayoutNode
 from rules.contrib.admin import ObjectPermissionsModelAdmin
 
 
-@reversion.register
-class ExtensibleModel(models.Model):
+class _ExtensibleModelBase(models.base.ModelBase):
+    """Ensure predefined behaviour on model creation.
+
+    This metaclass serves the following purposes:
+
+     - Register all AlekSIS models with django-reverseion
+    """
+
+    def __new__(mcls, name, bases, attrs):
+        mcls = super().__new__(mcls, name, bases, attrs)
+
+        if "Meta" not in attrs or not attrs["Meta"].abstract:
+            # Register all non-abstract models with django-reversion
+            mcls = reversion.register(mcls)
+
+        return mcls
+
+
+class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
     """Base model for all objects in AlekSIS apps.
 
     This base model ensures all objects in AlekSIS apps fulfill the
@@ -212,8 +229,8 @@ class PureDjangoModel(object):
 
 
 class _ExtensibleFormMetaclass(ModelFormMetaclass):
-    def __new__(cls, mcs, name, bases, dct):
-        x = super().__new__(mcs, name, bases, dct)
+    def __new__(cls, name, bases, dct):
+        x = super().__new__(cls, name, bases, dct)
 
         # Enforce a default for the base layout for forms that o not specify one
         if hasattr(x, "layout"):

aleksis/core/util/notifications.py

@@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _
 
 from templated_email import send_templated_mail
 
-from ..models import Notification
 from .core_helpers import lazy_preference
 
 try: