From 2c814cfecf3ee0a8a987edb017ef3842af029e27 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Tue, 19 Sep 2017 15:42:04 +0200 Subject: [PATCH] Renamed Model._meta.module_name to model_name Django 1.8 compatibility --- .../commands/telemeta-setup-enumerations.py | 4 ++-- telemeta/views/admin.py | 6 +++--- telemeta/views/collection.py | 4 ++-- telemeta/views/enum.py | 12 ++++++------ telemeta/views/item.py | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/telemeta/management/commands/telemeta-setup-enumerations.py b/telemeta/management/commands/telemeta-setup-enumerations.py index 500ae87f..45fbbedb 100644 --- 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 e843819c..c72e51f4 100644 --- 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 e5e52c74..fca2705b 100644 --- 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 1a8583ee..cb36814c 100644 --- 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 d19a55fb..4dcfd20a 100644 --- 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 -- 2.39.5