From 11e559c987e252d7fe08f050216de15b80d59bdc Mon Sep 17 00:00:00 2001 From: nicolas neto Date: Wed, 12 Jul 2017 16:47:31 +0200 Subject: [PATCH] correct bugs --- app/enumeration/enumeration.txt | 4 ++-- telemeta/views/admin.py | 2 +- telemeta/views/enum.py | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/enumeration/enumeration.txt b/app/enumeration/enumeration.txt index 9f6daa2f..cbae4b8f 100755 --- a/app/enumeration/enumeration.txt +++ b/app/enumeration/enumeration.txt @@ -3,7 +3,7 @@ True publishingstatus True acquisitionmode -True +False metadataauthor True metadatawriter @@ -19,7 +19,7 @@ True genericstyle True contextkeyword -True +False publisher False ethnicgroup diff --git a/telemeta/views/admin.py b/telemeta/views/admin.py index e16a1285..c749e114 100644 --- a/telemeta/views/admin.py +++ b/telemeta/views/admin.py @@ -76,7 +76,7 @@ class AdminView(object): return model - @method_decorator(permission_required('telemeta.change_physicalformat')) + @method_decorator(permission_required('telemeta.change_keyword')) def edit_enumeration(self, request, enumeration_id): atr = ""; enumeration = self.__get_enumeration(enumeration_id) diff --git a/telemeta/views/enum.py b/telemeta/views/enum.py index 16bcc7fa..499188c8 100644 --- a/telemeta/views/enum.py +++ b/telemeta/views/enum.py @@ -17,7 +17,7 @@ class EnumView(object): atr = ""; enumeration = self.__get_enumeration(enumeration_id) - if enumeration == None or enumeration.admin: + if enumeration == None or enumeration.admin == "True": raise Http404 vars = self.__get_admin_context_vars() vars["enumeration_id"] = enumeration._meta.module_name @@ -50,7 +50,6 @@ class EnumView(object): f = open("enumeration/enumeration.txt","r") s = f.read() - print s tab = s.split('\n') tab2 = [] for a in range(0, len(tab) - 1, 2): @@ -58,10 +57,9 @@ class EnumView(object): for model in models: if issubclass(model, Enumeration): for enu in tab2: - print enu if model._meta.module_name == enu["nom"]: model.admin = enu["admin"] - print model.admin + def __get_enumerations_list(self): @@ -71,8 +69,6 @@ class EnumView(object): enumerations = [] for model in models: if issubclass(model, Enumeration): - print model._meta.verbose_name - print model.admin if not model.hidden and model.admin == "False": enumerations.append({"name": model._meta.verbose_name, "id": model._meta.module_name -- 2.39.5