Mercurial > kallithea
changeset 2370:889cda9c2d14 beta
implemented #464 users groups links inside permission box (only for admins)
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 01 Jun 2012 23:47:16 +0200 |
| parents | c2f131502037 |
| children | a05e01144a2c |
| files | docs/changelog.rst rhodecode/config/routing.py rhodecode/controllers/changelog.py rhodecode/templates/admin/repos/repo_edit_perms.html |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Fri Jun 01 23:29:41 2012 +0200 +++ b/docs/changelog.rst Fri Jun 01 23:47:16 2012 +0200 @@ -18,6 +18,8 @@ their accounts - changed setup-app into setup-rhodecode and added default options to it. - new git repos are created as bare now by default +- #464 added links to groups in permission box +- #465 mentions autocomplete inside comments boxes fixes +++++
--- a/rhodecode/config/routing.py Fri Jun 01 23:29:41 2012 +0200 +++ b/rhodecode/config/routing.py Fri Jun 01 23:47:16 2012 +0200 @@ -213,7 +213,7 @@ m.connect("user_perm", "/users_perm/{id}", action="update_perm", conditions=dict(method=["PUT"])) - #ADMIN USERS REST ROUTES + #ADMIN USERS GROUPS REST ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/users_groups') as m: m.connect("users_groups", "/users_groups",
--- a/rhodecode/controllers/changelog.py Fri Jun 01 23:29:41 2012 +0200 +++ b/rhodecode/controllers/changelog.py Fri Jun 01 23:47:16 2012 +0200 @@ -38,7 +38,6 @@ from rhodecode.lib.compat import json from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError -from rhodecode.model.db import Repository log = logging.getLogger(__name__)
--- a/rhodecode/templates/admin/repos/repo_edit_perms.html Fri Jun 01 23:29:41 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html Fri Jun 01 23:47:16 2012 +0200 @@ -46,7 +46,12 @@ <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td> <td style="white-space: nowrap;"> - <img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/>${g2p.users_group.users_group_name} + <img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/> + %if h.HasPermissionAny('hg.admin')(): + <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a> + %else: + ${g2p.users_group.users_group_name} + %endif </td> <td> <span class="delete_icon action_button" onclick="ajaxActionUsersGroup(${g2p.users_group.users_group_id},'${'id%s'%id(g2p.users_group.users_group_name)}')">