diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /ishtar_common/ishtar_menu.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index 30cba6735..39bf7c1d6 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -28,9 +28,14 @@ import models MENU_SECTIONS = [ (5, SectionItem('admin', _(u"Administration"), childs=[ - MenuItem('account_management', _(u"Account management"), - model=models.IshtarUser, - access_controls=['add_ishtaruser', ]), + SectionItem( + 'account', _(u"Account"), + childs=[MenuItem('account_management', _(u"Add/modify"), + model=models.IshtarUser, + access_controls=['add_ishtaruser', ]), + MenuItem('account_deletion', _(u"Deletion"), + model=models.IshtarUser, + access_controls=['add_ishtaruser', ]), ]), MenuItem('admin-globalvar', _(u"Global variables"), model=models.GlobalVar, access_controls=['add_globalvar', ]), |