Show More
@@ -18,6 +18,8 b' news' | |||||
18 | their accounts |
|
18 | their accounts | |
19 | - changed setup-app into setup-rhodecode and added default options to it. |
|
19 | - changed setup-app into setup-rhodecode and added default options to it. | |
20 | - new git repos are created as bare now by default |
|
20 | - new git repos are created as bare now by default | |
|
21 | - #464 added links to groups in permission box | |||
|
22 | - #465 mentions autocomplete inside comments boxes | |||
21 |
|
23 | |||
22 | fixes |
|
24 | fixes | |
23 | +++++ |
|
25 | +++++ |
@@ -213,7 +213,7 b' def make_map(config):' | |||||
213 | m.connect("user_perm", "/users_perm/{id}", |
|
213 | m.connect("user_perm", "/users_perm/{id}", | |
214 | action="update_perm", conditions=dict(method=["PUT"])) |
|
214 | action="update_perm", conditions=dict(method=["PUT"])) | |
215 |
|
215 | |||
216 | #ADMIN USERS REST ROUTES |
|
216 | #ADMIN USERS GROUPS REST ROUTES | |
217 | with rmap.submapper(path_prefix=ADMIN_PREFIX, |
|
217 | with rmap.submapper(path_prefix=ADMIN_PREFIX, | |
218 | controller='admin/users_groups') as m: |
|
218 | controller='admin/users_groups') as m: | |
219 | m.connect("users_groups", "/users_groups", |
|
219 | m.connect("users_groups", "/users_groups", |
@@ -38,7 +38,6 b' from rhodecode.lib.helpers import RepoPa' | |||||
38 | from rhodecode.lib.compat import json |
|
38 | from rhodecode.lib.compat import json | |
39 |
|
39 | |||
40 | from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError |
|
40 | from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError | |
41 | from rhodecode.model.db import Repository |
|
|||
42 |
|
41 | |||
43 | log = logging.getLogger(__name__) |
|
42 | log = logging.getLogger(__name__) | |
44 |
|
43 |
@@ -46,7 +46,12 b'' | |||||
46 | <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td> |
|
46 | <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td> | |
47 | <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td> |
|
47 | <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td> | |
48 | <td style="white-space: nowrap;"> |
|
48 | <td style="white-space: nowrap;"> | |
49 |
<img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/> |
|
49 | <img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/> | |
|
50 | %if h.HasPermissionAny('hg.admin')(): | |||
|
51 | <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a> | |||
|
52 | %else: | |||
|
53 | ${g2p.users_group.users_group_name} | |||
|
54 | %endif | |||
50 | </td> |
|
55 | </td> | |
51 | <td> |
|
56 | <td> | |
52 | <span class="delete_icon action_button" onclick="ajaxActionUsersGroup(${g2p.users_group.users_group_id},'${'id%s'%id(g2p.users_group.users_group_name)}')"> |
|
57 | <span class="delete_icon action_button" onclick="ajaxActionUsersGroup(${g2p.users_group.users_group_id},'${'id%s'%id(g2p.users_group.users_group_name)}')"> |
General Comments 0
You need to be logged in to leave comments.
Login now