From 86184ca8acb51caa38d0e22b27e7c60ffd209871 Mon Sep 17 00:00:00 2001 From: nicolas neto Date: Wed, 12 Jul 2017 15:10:16 +0200 Subject: [PATCH] add change enumeration permanent --- app/enumeration/enumeration.txt | 54 +++++++++++++++++++ app/scripts/enumeration.sh | 4 ++ app/settings.py | 29 ---------- docker-compose.yml | 1 + telemeta/context_processors.py | 7 ++- .../telemeta/admin_enumerations.html | 4 +- telemeta/templates/telemeta/base.html | 2 +- telemeta/views/admin.py | 20 +++---- telemeta/views/enum.py | 46 +++++++++------- 9 files changed, 102 insertions(+), 65 deletions(-) create mode 100755 app/enumeration/enumeration.txt create mode 100755 app/scripts/enumeration.sh diff --git a/app/enumeration/enumeration.txt b/app/enumeration/enumeration.txt new file mode 100755 index 00000000..9f6daa2f --- /dev/null +++ b/app/enumeration/enumeration.txt @@ -0,0 +1,54 @@ +physicalformat +True +publishingstatus +True +acquisitionmode +True +metadataauthor +True +metadatawriter +True +legalright +False +recordingcontext +False +adconversion +True +vernacularstyle +True +genericstyle +True +contextkeyword +True +publisher +False +ethnicgroup +True +tapewheeldiameter +False +tapelength +False +tapewidth +False +tapespeed +False +tapevendor +False +numberofchannels +False +organization +False +rights +False +topic +False +copytype +True +mediatype +True +originalformat +True +status +True +identifiertype +True diff --git a/app/scripts/enumeration.sh b/app/scripts/enumeration.sh new file mode 100755 index 00000000..c6a42b04 --- /dev/null +++ b/app/scripts/enumeration.sh @@ -0,0 +1,4 @@ +#!/bin/bash + pwd + + chmod 777 "enumeration/enumeration.txt" && echo "The file is now writable" diff --git a/app/settings.py b/app/settings.py index 983a62bb..2acaa7a9 100644 --- a/app/settings.py +++ b/app/settings.py @@ -358,32 +358,3 @@ BOWER_INSTALLED_APPS = ( '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/docker-compose.yml b/docker-compose.yml index b064e296..6a1fbbb3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,7 @@ worker: env_file: - env/prod.env command: /bin/bash scripts/worker.sh + command: /bin/bash scripts/enumeration.sh links: - broker - db diff --git a/telemeta/context_processors.py b/telemeta/context_processors.py index 8d8bc4ef..0450cd9e 100644 --- a/telemeta/context_processors.py +++ b/telemeta/context_processors.py @@ -1,6 +1,5 @@ -from django.conf import settings -from telemeta.views.enum import * +from telemeta.views.enum import * def menu(request): - EnumView().set_enum_file() - return {'menu': EnumView().enu} \ No newline at end of file + EnumView().set_enum_file(request) + return {'menu': EnumView().enu} diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html index a6204b96..5ecc8eb3 100644 --- a/telemeta/templates/telemeta/admin_enumerations.html +++ b/telemeta/templates/telemeta/admin_enumerations.html @@ -17,8 +17,8 @@ {% for enum in enumerations %} - {% if perms.telemeta.change_keyword %} - + {% if perms.is_superuser %} + {% else %} {% endif %} diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 7712f2e3..52ded16e 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -137,7 +137,7 @@
  • {% trans "Advanced search" %}
  • -
  • {% trans "Vocabulary" %} +
  • {% trans "Therminology" %} {% if user.is_staff %}