Gitlab CSE Unil

Commit 71aaf038 authored by M. Chardon's avatar M. Chardon
Browse files

init env. geomo

parent 92c34198
...@@ -32,6 +32,7 @@ AO_ENVIRON = ( ...@@ -32,6 +32,7 @@ AO_ENVIRON = (
('', 'Standard'), ('', 'Standard'),
('cimaf', 'CIMAF'), ('cimaf', 'CIMAF'),
('anodate', 'Datation'), ('anodate', 'Datation'),
('geomo', 'Géomorpho'),
) )
class AOType(models.Model): class AOType(models.Model):
...@@ -274,6 +275,7 @@ class EnvParam(models.Model): ...@@ -274,6 +275,7 @@ class EnvParam(models.Model):
permissions = ( permissions = (
('set_env_cimaf', "Set CIMAF environment"), ('set_env_cimaf', "Set CIMAF environment"),
('set_env_anodate', "Set Anodate environment"), ('set_env_anodate', "Set Anodate environment"),
('set_env_geomo', "Set Geomorpho environment"),
) )
def init(self): def init(self):
......
...@@ -240,7 +240,8 @@ ADIM_ENV = { ...@@ -240,7 +240,8 @@ ADIM_ENV = {
# 'label': "Contexte", # 'label': "Contexte",
# 'color': "#25BFD1" # 'color': "#25BFD1"
}] }]
} },
'geomo': {}
} }
} }
......
...@@ -234,6 +234,8 @@ ...@@ -234,6 +234,8 @@
<option value="cimaf">CIMAF</option>{% endif %} <option value="cimaf">CIMAF</option>{% endif %}
{% if user|has_env_perm:"anodate" %} {% if user|has_env_perm:"anodate" %}
<option value="anodate">Datation</option>{% endif %} <option value="anodate">Datation</option>{% endif %}
{% if user|has_env_perm:"geomo" %}
<option value="geomo">Géomorphologie</option>{% endif %}
</select> </select>
</div> </div>
......
{% extends "adim/annotation.html" %}
{% load static i18n adim_app_tags %}
...@@ -6,7 +6,8 @@ django-split-settings==0.1.1 ...@@ -6,7 +6,8 @@ django-split-settings==0.1.1
djangorestframework==2.4.4 djangorestframework==2.4.4
drf-nested-routers==0.9.0 drf-nested-routers==0.9.0
eav-django==1.4.7 eav-django==1.4.7
MySQL-python==1.2.5 MySQL-python
Pillow==2.7.0 Pillow==2.7.0
python-ldap==2.4.19 python-ldap==2.4.19
python-memcached==1.53 python-memcached==1.53
django-cors-headers
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment