diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
| commit | dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a (patch) | |
| tree | 916cf36d9cd6d58e0c10e8711ee0c3f96c7bb221 /archaeological_warehouse | |
| parent | 987f84ca3aec153a6a9179e2b51083d7afaa9337 (diff) | |
| parent | e3bdd4b6d2a32c010138e8f4581234d18cf51519 (diff) | |
| download | Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.tar.bz2 Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/fixtures/initial_data-fr.json | 100 | ||||
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 2 |
2 files changed, 101 insertions, 1 deletions
diff --git a/archaeological_warehouse/fixtures/initial_data-fr.json b/archaeological_warehouse/fixtures/initial_data-fr.json index a1b4f9254..d67f8b0a1 100644 --- a/archaeological_warehouse/fixtures/initial_data-fr.json +++ b/archaeological_warehouse/fixtures/initial_data-fr.json @@ -168,5 +168,105 @@ "txt_idx": "museum", "label": "Mus\u00e9e" } + }, + { + "pk": 1, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "building", + "label": "B\u00e2timent" + } + }, + { + "pk": 2, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "floor", + "label": "\u00c9tage" + } + }, + { + "pk": 3, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "room", + "label": "Salle" + } + }, + { + "pk": 4, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "span", + "label": "Trav\u00e9e" + } + }, + { + "pk": 5, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "shelf", + "label": "\u00c9tag\u00e8re" + } + }, + { + "pk": 6, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "place", + "label": "Lieu dans la salle" + } + }, + { + "pk": 7, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "alley", + "label": "All\u00e9e" + } + }, + { + "pk": 8, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "rank", + "label": "Rang" + } + }, + { + "pk": 9, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "space", + "label": "Espace" + } + }, + { + "pk": 10, + "model": "archaeological_warehouse.warehousedivision", + "fields": { + "comment": "", + "available": true, + "txt_idx": "level", + "label": "Niveau" + } } ]
\ No newline at end of file diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index d2ebc2306..bcbfe881b 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -25,7 +25,7 @@ from archaeological_finds.models import Treatment import models -# be carreful: each access_controls must be relevant with check_rights in urls +# be careful: each access_controls must be relevant with check_rights in urls MENU_SECTIONS = [ |