Mercurial > kallithea
changeset 3861:c74eaaae4437 beta
added permission overview into users group
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 14 May 2013 00:07:06 +0200 |
parents | c71e05076359 |
children | 794e6eaad4aa |
files | rhodecode/controllers/admin/users_groups.py rhodecode/templates/admin/users_groups/users_group_edit.html |
diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users_groups.py Mon May 13 01:10:46 2013 +0200 +++ b/rhodecode/controllers/admin/users_groups.py Tue May 14 00:07:06 2013 +0200 @@ -66,6 +66,10 @@ c.available_permissions = config['available_permissions'] def __load_data(self, user_group_id): + permissions = { + 'repositories': {}, + 'repositories_groups': {} + } ugroup_repo_perms = UserGroupRepoToPerm.query()\ .options(joinedload(UserGroupRepoToPerm.permission))\ .options(joinedload(UserGroupRepoToPerm.repository))\ @@ -73,7 +77,7 @@ .all() for gr in ugroup_repo_perms: - c.users_group.permissions['repositories'][gr.repository.repo_name] \ + permissions['repositories'][gr.repository.repo_name] \ = gr.permission.permission_name ugroup_group_perms = UserGroupRepoGroupToPerm.query()\ @@ -83,9 +87,9 @@ .all() for gr in ugroup_group_perms: - c.users_group.permissions['repositories_groups'][gr.group.group_name] \ + permissions['repositories_groups'][gr.group.group_name] \ = gr.permission.permission_name - + c.permissions = permissions c.group_members_obj = sorted((x.user for x in c.users_group.members), key=lambda u: u.username.lower())
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html Mon May 13 01:10:46 2013 +0200 +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html Tue May 14 00:07:06 2013 +0200 @@ -118,9 +118,13 @@ </div> <%namespace name="dpb" file="/base/default_perms_box.html"/> ${dpb.default_perms_box(url('users_group_perm', id=c.users_group.users_group_id))} + + ## permissions overview + <%namespace name="p" file="/base/perms_summary.html"/> + ${p.perms_summary(c.permissions)} </div> -<div class="box box-right"> +<div class="box box-right" style="clear:right"> <div class="title"> <h5>${_('Permissions')}</h5> </div>