Mercurial > kallithea
comparison rhodecode/model/users_group.py @ 2709:d2d35cf2b351 beta
RhodeCode now has a option to explicitly set forking permissions. ref #508
- changed the way permissons on users groups behave. Now explicit set on user
is more important than permission set on users group
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 10 Aug 2012 03:09:36 +0200 |
parents | 9d4b80743a2a |
children | 5f1850e4712a |
comparison
equal
deleted
inserted
replaced
2708:9bce679a3f49 | 2709:d2d35cf2b351 |
---|---|
163 return UsersGroupToPerm.query()\ | 163 return UsersGroupToPerm.query()\ |
164 .filter(UsersGroupToPerm.users_group == users_group)\ | 164 .filter(UsersGroupToPerm.users_group == users_group)\ |
165 .filter(UsersGroupToPerm.permission == perm).scalar() is not None | 165 .filter(UsersGroupToPerm.permission == perm).scalar() is not None |
166 | 166 |
167 def grant_perm(self, users_group, perm): | 167 def grant_perm(self, users_group, perm): |
168 if not isinstance(perm, Permission): | |
169 raise Exception('perm needs to be an instance of Permission class') | |
170 | |
171 users_group = self.__get_users_group(users_group) | 168 users_group = self.__get_users_group(users_group) |
169 perm = self._get_perm(perm) | |
172 | 170 |
173 # if this permission is already granted skip it | 171 # if this permission is already granted skip it |
174 _perm = UsersGroupToPerm.query()\ | 172 _perm = UsersGroupToPerm.query()\ |
175 .filter(UsersGroupToPerm.users_group == users_group)\ | 173 .filter(UsersGroupToPerm.users_group == users_group)\ |
176 .filter(UsersGroupToPerm.permission == perm)\ | 174 .filter(UsersGroupToPerm.permission == perm)\ |