Mercurial > kallithea
changeset 3737:46b17730ca32 beta
implemented usergroup permissions checks.
- each user who has now explicit or inherited permissions can create usersgrous
- user is automatically an admin of that usergroup, and can manage it
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 10 Apr 2013 23:45:04 +0200 |
| parents | 87e6960e250b |
| children | 752a57988a48 |
| files | rhodecode/controllers/admin/users_groups.py rhodecode/model/users_group.py rhodecode/templates/admin/users_groups/users_groups.html |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users_groups.py Wed Apr 10 23:15:00 2013 +0200 +++ b/rhodecode/controllers/admin/users_groups.py Wed Apr 10 23:45:04 2013 +0200 @@ -36,7 +36,7 @@ from rhodecode.lib.exceptions import UserGroupsAssignedException from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator,\ - HasUserGroupPermissionAnyDecorator + HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator from rhodecode.lib.base import BaseController, render from rhodecode.model.scm import UserGroupList from rhodecode.model.users_group import UserGroupModel @@ -137,7 +137,7 @@ c.users_groups_list = sorted(group_iter, key=sk) return render('admin/users_groups/users_groups.html') - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true') def create(self): """POST /users_groups: Create a new item""" # url('users_groups') @@ -169,7 +169,7 @@ return redirect(url('users_groups')) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true') def new(self, format='html'): """GET /users_groups/new: Form to create a new item""" # url('new_users_group')
--- a/rhodecode/model/users_group.py Wed Apr 10 23:15:00 2013 +0200 +++ b/rhodecode/model/users_group.py Wed Apr 10 23:45:04 2013 +0200 @@ -106,6 +106,10 @@ self.sa.add(new_user_group) perm_obj = self._create_default_perms(new_user_group) self.sa.add(perm_obj) + + self.grant_user_permission(user_group=new_user_group, + user=owner, perm='usergroup.admin') + return new_user_group except Exception: log.error(traceback.format_exc())
--- a/rhodecode/templates/admin/users_groups/users_groups.html Wed Apr 10 23:15:00 2013 +0200 +++ b/rhodecode/templates/admin/users_groups/users_groups.html Wed Apr 10 23:45:04 2013 +0200 @@ -21,10 +21,11 @@ <div class="title"> ${self.breadcrumbs()} <ul class="links"> + %if h.HasPermissionAny('hg.usergroup.create.true')(): <li> <span>${h.link_to(_(u'Add new user group'),h.url('new_users_group'))}</span> </li> - + %endif </ul> </div> <!-- end box / title -->