diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
| commit | 1cc8d6156a79d8eff8d9f6ee82797df6e464408d (patch) | |
| tree | fc3cb300358ed90b4d08dac9a274bcc124dcec01 /ishtar_common/ishtar_menu.py | |
| parent | 1094b07f381b658f8325c2723afa2e26b8909ebb (diff) | |
| download | Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.tar.bz2 Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.zip | |
Merge action implementation (person and organization)
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 6 |
1 files changed, 6 insertions, 0 deletions
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', |