environnement variable change

diff --git a/app/settings.py b/app/settings.py
index b174104f1f9f15a461dba729b3eeba47a4b4a580..983a62bb06dbd03755c64dfefc97997d6c73df39 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -356,5 +356,34 @@ BOWER_INSTALLED_APPS = (
     'tablesorter',
     'video.js',
     'sass-bootstrap-glyphicons',
-    
+
 )
+ENUMERATION_PUBLIC = [{"nom":"physicalformat","admin":"False"},
+                      {"nom":"publishingstatus","admin":"False"},
+                      {"nom":"acquisitionmode","admin":"False"},
+                      {"nom":"metadataauthor","admin":"False"},
+                      {"nom": "metadatawriter", "admin": "False"},
+                      {"nom": "legalright", "admin": "False"},
+                      {"nom": "recordingcontext", "admin": "True"},
+                      {"nom": "adconversion", "admin": "False"},
+                      {"nom": "vernacularstyle", "admin": "False"},
+                      {"nom": "genericstyle", "admin": "False"},
+                      {"nom": "contextkeyword", "admin": "False"},
+                      {"nom": "publisher", "admin": "False"},
+                      {"nom": "ethnicgroup", "admin": "False"},
+                      {"nom": "tapewheeldiameter", "admin": "False"},
+                      {"nom": "tapelength", "admin": "False"},
+                      {"nom": "tapewidth", "admin": "False"},
+                      {"nom": "tapespeed", "admin": "False"},
+                      {"nom": "tapevendor", "admin": "False"},
+                      {"nom": "numberofchannels", "admin": "False"},
+                      {"nom": "organization", "admin": "False"},
+                      {"nom": "rights", "admin": "False"},
+                      {"nom": "topic", "admin": "False"},
+                      {"nom": "copytype", "admin": "False"},
+                      {"nom": "mediatype", "admin": "False"},
+                      {"nom": "originalformat", "admin": "False"},
+                      {"nom": "status", "admin": "False"},
+                      {"nom": "identifiertype", "admin": "False"},
+                      ]
+

diff --git a/telemeta/context_processors.py b/telemeta/context_processors.py
index a9e54ccab9acc7870708a59e2bf1a61876277f8b..8d8bc4efbf85035c29c7d202d37e8340683476a5 100644 (file)
--- a/telemeta/context_processors.py
+++ b/telemeta/context_processors.py
@@ -2,4 +2,5 @@ from django.conf import settings
 from telemeta.views.enum import *
 
 def menu(request):
+    EnumView().set_enum_file()
     return {'menu': EnumView().enu}
\ No newline at end of file

diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py
index 55bc50a974785357877b4a0479225bc1358195f8..d98609a843007a249d02712558a3b1cc02f656eb 100644 (file)
--- a/telemeta/models/enum.py
+++ b/telemeta/models/enum.py
@@ -33,7 +33,6 @@ class Enumeration(ModelCore):
 
     def _set_admin(self):
         self.admin = not self.admin
-        print self.admin
 
     def __unicode__(self):
         return self.value

diff --git a/telemeta/views/admin.py b/telemeta/views/admin.py
index bfefdc6817552a462758f68a37cc5c8820e90fee..e542b993dffed95fcfbd0ac0e9cf30450653d356 100644 (file)
--- a/telemeta/views/admin.py
+++ b/telemeta/views/admin.py
@@ -164,22 +164,21 @@ class AdminView(object):
     @method_decorator(permission_required('telemeta.change_keyword'))
     def set_admin_enumeration(self, request):
 
-        if request.method == 'POST':
-            print request.POST.getlist('sel')
             from django.db.models import get_models
             models = get_models(telemeta.models)
 
             for model in models:
                 if issubclass(model, Enumeration):
                     if model._meta.module_name in request.POST.getlist('sel'):
-                        print model._meta.module_name
                         model.admin = True
-                    else :
-                        print model._meta.module_name
+                    else:
                         model.admin = False
+                for enu in settings.ENUMERATION_PUBLIC:
+                    if model._meta.module_name == enu["nom"]:
+                        enu["admin"] = str(model.admin)
 
+            return self.admin_enumerations(request)
 
-        return self.admin_enumerations(request)
 
     @method_decorator(permission_required('telemeta.change_keyword'))
     def edit_enumeration_value(self, request, enumeration_id, value_id):

diff --git a/telemeta/views/enum.py b/telemeta/views/enum.py
index aafef050ddbc64e29aa85fc845580b29ea380cc9..227729c69e5be41b224845ea1e60bbb268b1f27c 100644 (file)
--- a/telemeta/views/enum.py
+++ b/telemeta/views/enum.py
@@ -15,7 +15,6 @@ class EnumView(object):
 
     def enumeration (self, request, enumeration_id):
         atr = "";
-        print enumeration_id
         enumeration = self.__get_enumeration(enumeration_id)
         if enumeration == None or enumeration.admin:
             raise Http404
@@ -42,14 +41,6 @@ class EnumView(object):
 
         return render(request, 'telemeta/enumeration.html', vars)
 
-    @property
-    def get_enumerations_list(self):
-        test = {
-            "ceci",
-            "est",
-            "un",
-            "test"}
-        return test
 
     def __get_enumerations_list(self):
         from django.db.models import get_models
@@ -61,15 +52,11 @@ class EnumView(object):
 
                 if not model.hidden and not model.admin:
                     enumerations.append({"name": model._meta.verbose_name,
-                                           "id": model._meta.module_name
+                                         "id": model._meta.module_name
                                          })
-                else:
-                    print model._meta.module_name + "____"
-                    print model.admin
 
         cmp = lambda obj1, obj2: unaccent_icmp(obj1['name'], obj2['name'])
         enumerations.sort(cmp)
-        print enumerations
         self.enu = enumerations
         return enumerations
 
@@ -116,3 +103,20 @@ class EnumView(object):
             c.append(MediaItemKeyword.objects.filter(**{lookup: enum.__getattribute__("id")}).count())
         c.reverse()
         return c
+
+    def set_enum_file(self):
+        from django.db.models import get_models
+        models = get_models(telemeta.models)
+
+
+        for model in models:
+            if issubclass(model, Enumeration):
+                for enu in settings.ENUMERATION_PUBLIC:
+                    if model._meta.module_name == enu["nom"]:
+                        if enu["admin"] == "True":
+                            model.admin = True
+                        else:
+                            model.admin = False
+
+
+