diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:31:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:31:51 +0200 |
| commit | 50162e444ac3f50194318338cfb3b1ad7480f9a8 (patch) | |
| tree | bfad38e1c51e88d95af4e2588ea7f34e567821bb /ishtar_common/ishtar_menu.py | |
| parent | 076ce993f1524d646fae406cb493661312260b20 (diff) | |
| parent | 4b7ee2dcb97a3b01670949a8de5ee6029c270f04 (diff) | |
| download | Ishtar-50162e444ac3f50194318338cfb3b1ad7480f9a8.tar.bz2 Ishtar-50162e444ac3f50194318338cfb3b1ad7480f9a8.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 12 |
1 files changed, 10 insertions, 2 deletions
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( |