summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/ishtar_menu.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_warehouse/ishtar_menu.py')
-rw-r--r--archaeological_warehouse/ishtar_menu.py8
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',