From 9ad7082177fb9402723fe704c48d63e078e299a0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 12 Sep 2016 15:05:16 +0200 Subject: Manual merge action (refs #3176) --- ishtar_common/ishtar_menu.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'ishtar_common/ishtar_menu.py') diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index 39bf7c1d6..1f30bec0f 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -59,7 +59,11 @@ MENU_SECTIONS = [ model=models.Person, access_controls=['change_person', 'change_own_person']), MenuItem( - 'person_merge', _(u"Merge"), + 'person-merge', _(u"Automatic merge"), + model=models.Person, + access_controls=['merge_person']), + MenuItem( + 'person-manual-merge', _(u"Manual merge"), model=models.Person, access_controls=['merge_person']), MenuItem( @@ -86,7 +90,11 @@ MENU_SECTIONS = [ access_controls=['change_organization', 'change_own_organization']), MenuItem( - 'organization_merge', _(u"Merge"), + 'organization-merge', _(u"Automatic merge"), + model=models.Organization, + access_controls=['merge_organization']), + MenuItem( + 'orga-manual-merge', _(u"Manual merge"), model=models.Organization, access_controls=['merge_organization']), MenuItem( -- cgit v1.2.3