Renamed Model._meta.module_name to model_name

Django 1.8 compatibility

diff --git a/telemeta/management/commands/telemeta-setup-enumerations.py b/telemeta/management/commands/telemeta-setup-enumerations.py
index 500ae87fc23edcd85163cb663b1e5dd72f4ce1b2..45fbbedb574a531c77bfb09e6cbe6f6a044d611f 100644 (file)
--- a/telemeta/management/commands/telemeta-setup-enumerations.py
+++ b/telemeta/management/commands/telemeta-setup-enumerations.py
@@ -14,9 +14,9 @@ class Command(BaseCommand):
         models = get_models(telemeta.models)
         for model in models:
             if issubclass(model, Enumeration):
-                enumeration_property = EnumerationProperty.objects.filter(enumeration_name=model._meta.module_name)
+                enumeration_property = EnumerationProperty.objects.filter(enumeration_name=model._meta.model_name)
                 if not enumeration_property:
-                    enumeration_property = EnumerationProperty(enumeration_name=model._meta.module_name)
+                    enumeration_property = EnumerationProperty(enumeration_name=model._meta.model_name)
                     enumeration_property.is_admin = True
                     enumeration_property.is_hidden = False
                     enumeration_property.save()

diff --git a/telemeta/views/admin.py b/telemeta/views/admin.py
index e843819cee0b98c44459c314db5d93ed6e7ff2b9..c72e51f4501631e1788abb63cca5051c23026e18 100644 (file)
--- a/telemeta/views/admin.py
+++ b/telemeta/views/admin.py
@@ -53,7 +53,7 @@ class AdminView(object):
         enumerations = []
         for model in models:
             if issubclass(model, Enumeration):
-                enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.module_name)
+                enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.model_name)
                 if not enumeration_property.is_hidden :
                     enumerations.append({"name": model._meta.verbose_name,
                                          "id": model._meta.model_name,
@@ -166,8 +166,8 @@ class AdminView(object):
             models = get_models(telemeta.models)
             for model in models:
                 if issubclass(model, Enumeration):
-                    enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.module_name)
-                    if model._meta.module_name in request.POST.getlist('sel'):
+                    enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.model_name)
+                    if model._meta.model_name in request.POST.getlist('sel'):
                         enumeration_property.is_hidden = True
                     else:
                         enumeration_property.is_hidden = False

diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py
index e5e52c74875f87735aca158cc117b9fc6059d135..fca2705b5aa5150a766ab9d4e0b1cc2bde2ddc2e 100644 (file)
--- a/telemeta/views/collection.py
+++ b/telemeta/views/collection.py
@@ -414,10 +414,10 @@ class CollectionEnumListView(CollectionListView):
         from django.db.models import get_models
         models = get_models(telemeta.models)
         for model in models:
-            if model._meta.module_name == id:
+            if model._meta.model_name == id:
                 break
 
-        if model._meta.module_name != id:
+        if model._meta.model_name != id:
             return None
         return model
 

diff --git a/telemeta/views/enum.py b/telemeta/views/enum.py
index 1a8583eea98aaffe3e806e6c597c547b225825b7..cb36814c7d3848c00a5a507bfc2aedc0507da870 100644 (file)
--- a/telemeta/views/enum.py
+++ b/telemeta/views/enum.py
@@ -21,7 +21,7 @@ class EnumView(object):
         if enumeration == None or enumeration.admin == "True":
             raise Http404
         vars = self.__get_admin_context_vars()
-        vars["enumeration_id"] = enumeration._meta.module_name
+        vars["enumeration_id"] = enumeration._meta.model_name
         vars["enumeration_name"] = enumeration._meta.verbose_name
         vars["enumeration_values"] = enumeration.objects.all()
         vars["enumeration_support"] = ""
@@ -56,7 +56,7 @@ class EnumView(object):
         for model in models:
             if issubclass(model, Enumeration):
                 for enu in tab2:
-                    if model._meta.module_name == enu["nom"]:
+                    if model._meta.model_name == enu["nom"]:
                         model.admin = enu["admin"]
 
     def __get_enumerations_list(self):
@@ -65,10 +65,10 @@ class EnumView(object):
         enumerations = []
         for model in models:
             if issubclass(model, Enumeration):
-                enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.module_name)
+                enumeration_property = EnumerationProperty.objects.get(enumeration_name=model._meta.model_name)
                 if not enumeration_property.is_hidden and not enumeration_property.is_admin:
                     enumerations.append({"name": model._meta.verbose_name,
-                                         "id": model._meta.module_name
+                                         "id": model._meta.model_name
                                          })
 
         cmp = lambda obj1, obj2: unaccent_icmp(obj1['name'], obj2['name'])
@@ -79,10 +79,10 @@ class EnumView(object):
         from django.db.models import get_models
         models = get_models(telemeta.models)
         for model in models:
-            if model._meta.module_name == id:
+            if model._meta.model_name == id:
                 break
 
-        if model._meta.module_name != id:
+        if model._meta.model_name != id:
             return None
         return model
 

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index d19a55fb158268964bfbed81d0a957bca1e7853d..4dcfd20a8de1dad4d2e32806c85590335fad224e 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -1088,9 +1088,9 @@ class ItemEnumListView(ItemListView):
         from django.db.models import get_models
         models = get_models(telemeta.models)
         for model in models:
-            if model._meta.module_name == id:
+            if model._meta.model_name == id:
                 break
-        if model._meta.module_name != id:
+        if model._meta.model_name != id:
             return None
         return model
 
@@ -1169,9 +1169,9 @@ class ItemKeywordListView(ItemListView):
         from django.db.models import get_models
         models = get_models(telemeta.models)
         for model in models:
-            if model._meta.module_name == id:
+            if model._meta.model_name == id:
                 break
-        if model._meta.module_name != id:
+        if model._meta.model_name != id:
             return None
         return model