kallithea Changeset - 889cda9c2d14

Changeset - 889cda9c2d14

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-06-01 23:47:16
marcin@python-works.com

implemented #464 users groups links inside permission box (only for admins)

4 files changed with 9 insertions and 3 deletions:

docs/changelog.rst

rhodecode/config/routing.py

rhodecode/controllers/changelog.py

rhodecode/templates/admin/repos/repo_edit_perms.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -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
 +++++

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -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",

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -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__)

rhodecode/templates/admin/repos/repo_edit_perms.html

➞

Show inline comments

@@ @@ -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)}')">

0 comments (0 inline, 0 general)