diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_warehouse/ishtar_menu.py | |
parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_warehouse/ishtar_menu.py')
-rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index f9f0daf33..c240cba84 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -23,29 +23,60 @@ from ishtar_common.menu_base import SectionItem, MenuItem from archaeological_finds.models import Treatment +import models + # be carreful: each access_controls must be relevant with check_rights in urls MENU_SECTIONS = [ - (60, SectionItem('find_management', _(u"Find"), + (70, SectionItem('treatment_management', _(u"Treatment"), profile_restriction='warehouse', childs=[ MenuItem('warehouse_packaging', _(u"Packaging"), model=Treatment, access_controls=['add_treatment', 'add_own_treatment']), ])), + (80, SectionItem('warehouse', _(u"Warehouse"), + profile_restriction='warehouse', + childs=[ + MenuItem('warehouse_search', _(u"Search"), + model=models.Warehouse, + access_controls=['view_warehouse',]), + MenuItem('warehouse_creation', _(u"Creation"), + model=models.Warehouse, + access_controls=['add_warehouse',]), + MenuItem('warehouse_modification', _(u"Modification"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('warehouse_deletion', _(u"Deletion"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + SectionItem( + 'containers', _(u"Containers"), + childs=[ + MenuItem('container_search', _(u"Search"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('container_creation', _(u"Creation"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('container_modification', _(u"Modification"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('container_deletion', _(u"Deletion"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + ]) + ])) ] """ - (60, SectionItem('warehouse', _(u"Warehouse"), - childs=[ - MenuItem('warehouse_inventory', _(u"Inventory"), - model=models.Warehouse, - access_controls=['change_warehouse',]), - MenuItem('warehouse_recording', _(u"Recording"), - model=Treatment, - access_controls=['add_treatment', 'add_own_treatment']), - MenuItem('warehouse_lend', _(u"Lending"), - model=Treatment, - access_controls=['add_treatment', 'add_own_treatment']), - ])) + MenuItem('warehouse_inventory', _(u"Inventory"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('warehouse_recording', _(u"Recording"), + model=Treatment, + access_controls=['add_treatment', 'add_own_treatment']), + MenuItem('warehouse_lend', _(u"Lending"), + model=Treatment, + access_controls=['add_treatment', 'add_own_treatment']), """ |