diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-08 18:06:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 721cf51b30ed646f2073bc56aaf62ff1878aef94 (patch) | |
| tree | 47c2df9adb1820c3993f1e50743dafcf86262e15 /archaeological_warehouse/ishtar_menu.py | |
| parent | 5c0a4d451ec653d76ae26c444da8c000460c9db6 (diff) | |
| download | Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.tar.bz2 Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.zip | |
New container management - merge action
Diffstat (limited to 'archaeological_warehouse/ishtar_menu.py')
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index b7c820d13..17acae47a 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -58,6 +58,14 @@ MENU_SECTIONS = [ model=models.Warehouse, access_controls=['change_container', 'change_own_container']), + MenuItem( + 'container-merge', _(u"Automatic merge"), + model=models.Container, + access_controls=['administrator']), + MenuItem( + 'container-manual-merge', _(u"Manual merge"), + model=models.Container, + access_controls=['administrator']), MenuItem('container_deletion', _(u"Deletion"), model=models.Warehouse, access_controls=['change_container', |