Use _meta.model_name and fall back to _meta.module_name

matthiask · matthiask · commit 2716c599a325 · 2014-05-08T10:39:05.000+02:00
diff --git a/feincms/_internal.py b/feincms/_internal.py
@@ -63,3 +63,10 @@ def get_permission_codename(action, opts):
     of Django.
     """
     return '%s_%s' % (action, opts.model_name)
+
+
+def get_model_name(opts):
+    try:
+        return opts.model_name
+    except AttributeError:
+        return opts.module_name
diff --git a/feincms/content/comments/models.py b/feincms/content/comments/models.py
@@ -23,6 +23,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms.admin.item_editor import ItemEditorForm
+from feincms._internal import get_model_name
 
 
 # ------------------------------------------------------------------------
@@ -59,7 +60,7 @@ def __init__(self, *args, **kwargs):
                                 _('public') if c.is_public
                                 else _('not public')),
                             'app': comments_model._meta.app_label,
-                            'model': comments_model._meta.module_name,
+                            'model': get_model_name(comments_model._meta),
                         }
                     f.help_text = r
 
diff --git a/feincms/management/checker.py b/feincms/management/checker.py
@@ -3,8 +3,10 @@
 from django.core.management.color import color_style
 from django.db import connection
 
+from feincms._internal import get_model_name
 
-def check_database_schema(cls, module_name):
+
+def check_database_schema(cls, model_name):
     """
     Returns a function which inspects the database table of the passed class.
     It checks whether all fields in the model are available on the database
@@ -23,7 +25,7 @@ def check_database_schema(cls, module_name):
     """
 
     def _fn(sender, **kwargs):
-        if sender.__name__ != module_name:
+        if sender.__name__ != model_name:
             return
 
         cursor = connection.cursor()
diff --git a/feincms/models.py b/feincms/models.py
@@ -25,6 +25,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms import ensure_completely_loaded
+from feincms._internal import get_model_name
 from feincms.extensions import ExtensionsMixin
 from feincms.utils import copy_model_instance
 
@@ -521,7 +522,7 @@ def fe_identifier(self):
 
                 return '%s-%s-%s-%s-%s' % (
                     cls._meta.app_label,
-                    cls._meta.module_name,
+                    get_model_name(cls._meta),
                     self.__class__.__name__.lower(),
                     self.parent_id,
                     self.id,
diff --git a/feincms/module/mixins.py b/feincms/module/mixins.py
@@ -55,6 +55,11 @@ def app_label(self):
         """
         return self._meta.app_label
 
+    @property
+    def model_name(self):
+        "See app_label"
+        return self.__class__.__name__.lower()
+
     @property
     def module_name(self):
         "See app_label"
diff --git a/feincms/module/page/forms.py b/feincms/module/page/forms.py
@@ -15,6 +15,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms import ensure_completely_loaded
+from feincms._internal import get_model_name
 
 from mptt.forms import MPTTAdminForm
 
@@ -23,12 +24,12 @@ class RedirectToWidget(ForeignKeyRawIdWidget):
     def label_for_value(self, value):
         match = re.match(
             # XXX this regex would be available as .models.REDIRECT_TO_RE
-            r'^(?P<app_label>\w+).(?P<module_name>\w+):(?P<pk>\d+)$',
+            r'^(?P<app_label>\w+).(?P<model_name>\w+):(?P<pk>\d+)$',
             value)
 
         if match:
             matches = match.groupdict()
-            model = get_model(matches['app_label'], matches['module_name'])
+            model = get_model(matches['app_label'], matches['model_name'])
             try:
                 instance = model._default_manager.get(pk=int(matches['pk']))
                 return '&nbsp;<strong>%s (%s)</strong>' % (
@@ -169,7 +170,7 @@ def clean(self):
         if redirect_to and re.match(r'^\d+$', redirect_to):
             opts = self.page_model._meta
             cleaned_data['redirect_to'] = '%s.%s:%s' % (
-                opts.app_label, opts.module_name, redirect_to)
+                opts.app_label, get_model_name(opts), redirect_to)
 
         if not cleaned_data['active']:
             # If the current item is inactive, we do not need to conduct
diff --git a/feincms/module/page/models.py b/feincms/module/page/models.py
@@ -29,7 +29,7 @@
 
 
 REDIRECT_TO_RE = re.compile(
-    r'^(?P<app_label>\w+).(?P<module_name>\w+):(?P<pk>\d+)$')
+    r'^(?P<app_label>\w+).(?P<model_name>\w+):(?P<pk>\d+)$')
 
 
 # ------------------------------------------------------------------------
@@ -381,7 +381,7 @@ def get_redirect_to_target(self, request):
             return self.redirect_to
 
         matches = match.groupdict()
-        model = get_model(matches['app_label'], matches['module_name'])
+        model = get_model(matches['app_label'], matches['model_name'])
 
         if not model:
             return self.redirect_to
