Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
ADIM
Commits
71aaf038
Commit
71aaf038
authored
Jan 10, 2017
by
M. Chardon
Browse files
init env. geomo
parent
92c34198
Changes
5
Hide whitespace changes
Inline
Side-by-side
adim_project/adim/models/annotables.py
View file @
71aaf038
...
...
@@ -32,6 +32,7 @@ AO_ENVIRON = (
(
''
,
'Standard'
),
(
'cimaf'
,
'CIMAF'
),
(
'anodate'
,
'Datation'
),
(
'geomo'
,
'Géomorpho'
),
)
class
AOType
(
models
.
Model
):
...
...
@@ -274,6 +275,7 @@ class EnvParam(models.Model):
permissions
=
(
(
'set_env_cimaf'
,
"Set CIMAF environment"
),
(
'set_env_anodate'
,
"Set Anodate environment"
),
(
'set_env_geomo'
,
"Set Geomorpho environment"
),
)
def
init
(
self
):
...
...
adim_project/adim_project/settings/base.py
View file @
71aaf038
...
...
@@ -240,7 +240,8 @@ ADIM_ENV = {
# 'label': "Contexte",
# 'color': "#25BFD1"
}]
}
},
'geomo'
:
{}
}
}
...
...
adim_project/templates/adim/aom-modal.inc.html
View file @
71aaf038
...
...
@@ -234,6 +234,8 @@
<option
value=
"cimaf"
>
CIMAF
</option>
{% endif %}
{% if user|has_env_perm:"anodate" %}
<option
value=
"anodate"
>
Datation
</option>
{% endif %}
{% if user|has_env_perm:"geomo" %}
<option
value=
"geomo"
>
Géomorphologie
</option>
{% endif %}
</select>
</div>
...
...
adim_project/templates/adim/env/geomo/annotation.html
0 → 100644
View file @
71aaf038
{% extends "adim/annotation.html" %}
{% load static i18n adim_app_tags %}
requirements/base.txt
View file @
71aaf038
...
...
@@ -6,7 +6,8 @@ django-split-settings==0.1.1
djangorestframework==2.4.4
drf-nested-routers==0.9.0
eav-django==1.4.7
MySQL-python
==1.2.5
MySQL-python
Pillow==2.7.0
python-ldap==2.4.19
python-memcached==1.53
django-cors-headers
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment