diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /ishtar_common/ishtar_menu.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index 1f30bec0f..5ed8cad37 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -30,7 +30,7 @@ MENU_SECTIONS = [ childs=[ SectionItem( 'account', _(u"Account"), - childs=[MenuItem('account_management', _(u"Add/modify"), + childs=[MenuItem('account_management', _(u"Addition/modification"), model=models.IshtarUser, access_controls=['add_ishtaruser', ]), MenuItem('account_deletion', _(u"Deletion"), @@ -67,7 +67,7 @@ MENU_SECTIONS = [ model=models.Person, access_controls=['merge_person']), MenuItem( - 'person_deletion', _(u"Delete"), + 'person_deletion', _(u"Deletion"), model=models.Person, access_controls=['change_person', 'change_own_person']), ]), @@ -98,7 +98,7 @@ MENU_SECTIONS = [ model=models.Organization, access_controls=['merge_organization']), MenuItem( - 'organization_deletion', _(u"Delete"), + 'organization_deletion', _(u"Deletion"), model=models.Organization, access_controls=['change_organization', 'change_own_organization']), |