Mercurial > kallithea
changeset 2532:19de74e33fb0 beta
Better descriptions of given permission overview in edit user view
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 02 Jul 2012 00:22:57 +0200 |
| parents | d80a68e2ebcc |
| children | 5a826060251f |
| files | rhodecode/lib/db_manage.py rhodecode/lib/helpers.py rhodecode/model/db.py rhodecode/templates/admin/users/user_edit.html |
| diffstat | 4 files changed, 33 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py Sun Jul 01 23:36:03 2012 +0200 +++ b/rhodecode/lib/db_manage.py Mon Jul 02 00:22:57 2012 +0200 @@ -479,33 +479,12 @@ def create_permissions(self): # module.(access|create|change|delete)_[name] # module.(none|read|write|admin) - perms = [ - ('repository.none', 'Repository no access'), - ('repository.read', 'Repository read access'), - ('repository.write', 'Repository write access'), - ('repository.admin', 'Repository admin access'), - ('group.none', 'Repositories Group no access'), - ('group.read', 'Repositories Group read access'), - ('group.write', 'Repositories Group write access'), - ('group.admin', 'Repositories Group admin access'), - - ('hg.admin', 'Hg Administrator'), - ('hg.create.repository', 'Repository create'), - ('hg.create.none', 'Repository creation disabled'), - ('hg.register.none', 'Register disabled'), - ('hg.register.manual_activate', 'Register new user with RhodeCode ' - 'without manual activation'), - - ('hg.register.auto_activate', 'Register new user with RhodeCode ' - 'without auto activation'), - ] - - for p in perms: + for p in Permission.PERMS: if not Permission.get_by_key(p[0]): new_perm = Permission() new_perm.permission_name = p[0] - new_perm.permission_longname = p[1] + new_perm.permission_longname = p[0] self.sa.add(new_perm) def populate_default_permissions(self):
--- a/rhodecode/lib/helpers.py Sun Jul 01 23:36:03 2012 +0200 +++ b/rhodecode/lib/helpers.py Mon Jul 02 00:22:57 2012 +0200 @@ -46,7 +46,7 @@ from rhodecode.lib.vcs.backends.base import BaseChangeset from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT from rhodecode.model.changeset_status import ChangesetStatusModel -from rhodecode.model.db import URL_SEP +from rhodecode.model.db import URL_SEP, Permission log = logging.getLogger(__name__) @@ -1007,3 +1007,7 @@ def changeset_status_lbl(changeset_status): return dict(ChangesetStatus.STATUSES).get(changeset_status) + + +def get_permission_name(key): + return dict(Permission.PERMS).get(key)
--- a/rhodecode/model/db.py Sun Jul 01 23:36:03 2012 +0200 +++ b/rhodecode/model/db.py Mon Jul 02 00:22:57 2012 +0200 @@ -1058,6 +1058,28 @@ {'extend_existing': True, 'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}, ) + PERMS = [ + ('repository.none', _('Repository no access')), + ('repository.read', _('Repository read access')), + ('repository.write', _('Repository write access')), + ('repository.admin', _('Repository admin access')), + + ('group.none', _('Repositories Group no access')), + ('group.read', _('Repositories Group read access')), + ('group.write', _('Repositories Group write access')), + ('group.admin', _('Repositories Group admin access')), + + ('hg.admin', _('RhodeCode Administrator')), + ('hg.create.none', _('Repository creation disabled')), + ('hg.create.repository', _('Repository creation enabled')), + ('hg.register.none', _('Register disabled')), + ('hg.register.manual_activate', _('Register new user with RhodeCode ' + 'with manual activation')), + + ('hg.register.auto_activate', _('Register new user with RhodeCode ' + 'with auto activation')), + ] + permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) permission_name = Column("permission_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) permission_longname = Column("permission_longname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
--- a/rhodecode/templates/admin/users/user_edit.html Sun Jul 01 23:36:03 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit.html Mon Jul 02 00:22:57 2012 +0200 @@ -186,14 +186,14 @@ %elif section == 'repositories_groups': <a href="${h.url('repos_group_home',group_name=k)}">${k}</a> %else: - ${k} + ${h.get_permission_name(k)} %endif </td> <td> %if section == 'global': - ${h.bool2icon(True)} + ${h.bool2icon(k.split('.')[-1] != 'none')} %else: - <span class="perm_tag ${_perm}">${section_perm}</span> + <span class="perm_tag ${_perm}">${section_perm}</span> %endif </td> </tr> @@ -204,7 +204,7 @@ %endfor </div> </div> -<div class="box box-right"> +<div class="box box-left"> <!-- box / title --> <div class="title"> <h5>${_('Email addresses')}</h5>