diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:36:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:36:01 +0200 |
| commit | 87cd9b259315a7efda4fcd0e31f93caf5cb184cb (patch) | |
| tree | bf47f8563cfc05edeab89901fdb165c5d5e7cffc /ishtar_common/ishtar_menu.py | |
| parent | 2fa2c9d11d605ffbaf8ce21b247d88fe1fa8ecca (diff) | |
| parent | 50162e444ac3f50194318338cfb3b1ad7480f9a8 (diff) | |
| download | Ishtar-87cd9b259315a7efda4fcd0e31f93caf5cb184cb.tar.bz2 Ishtar-87cd9b259315a7efda4fcd0e31f93caf5cb184cb.zip | |
Merge branch 'v0.9' into wheezy
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( |