From 1cc8d6156a79d8eff8d9f6ee82797df6e464408d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 28 Nov 2014 11:30:02 +0100 Subject: Merge action implementation (person and organization) --- ishtar_common/ishtar_menu.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ishtar_common/ishtar_menu.py') diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index 4303b707e..1dd22bd8a 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -45,6 +45,9 @@ MENU_SECTIONS = [ MenuItem('person_modification', _(u"Modification"), model=models.Person, access_controls=['change_person', 'change_own_person']), + MenuItem('person_merge', _(u"Merge"), + model=models.Person, + access_controls=['merge_person',]), MenuItem('person_deletion', _(u"Delete"), model=models.Person, access_controls=['change_person', 'change_own_person']), @@ -59,6 +62,9 @@ MENU_SECTIONS = [ model=models.Organization, access_controls=['change_organization', 'change_own_organization']), + MenuItem('organization_merge', _(u"Merge"), + model=models.Organization, + access_controls=['merge_organization',]), MenuItem('organization_deletion', _(u"Delete"), model=models.Organization, access_controls=['change_organization', -- cgit v1.2.3