correct bugs

diff --git a/app/enumeration/enumeration.txt b/app/enumeration/enumeration.txt
index 9f6daa2f8cfd446e61b776f1a232473df884876a..cbae4b8f6576e317d77d7ed7c082483cb53fc9d5 100755 (executable)
--- 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 e16a12855c39822aa210b1ff4e7b004ca95edf41..c749e114b2e9e3e3e55ef4a1deee662f42e77919 100644 (file)
--- 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 16bcc7fae1697861506bae958831aa13b843903f..499188c8ab076d8d42a0535d9e4b28d1d636841b 100644 (file)
--- 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