From 9be03de7917bb321119641b9d0063cd060d9b3c1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 8 Apr 2020 18:06:26 +0200 Subject: New container management - merge action --- archaeological_warehouse/ishtar_menu.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'archaeological_warehouse/ishtar_menu.py') 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', -- cgit v1.2.3