diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,8 @@ news 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 +++++ diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -213,7 +213,7 @@ def make_map(config): 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", diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py --- a/rhodecode/controllers/changelog.py +++ b/rhodecode/controllers/changelog.py @@ -38,7 +38,6 @@ from rhodecode.lib.helpers import RepoPa from rhodecode.lib.compat import json from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError -from rhodecode.model.db import Repository log = logging.getLogger(__name__) diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -46,7 +46,12 @@ ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')} ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')} - ${g2p.users_group.users_group_name} + + %if h.HasPermissionAny('hg.admin')(): + ${g2p.users_group.users_group_name} + %else: + ${g2p.users_group.users_group_name} + %endif