diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-09-07 02:20:02 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-09-07 02:20:02 +0200 |
| commit | 859235dc7e1181b3fa78227d9e0ea1d223b35199 (patch) | |
| tree | 12ab4eec1cfe7969eb35dc9985231a6939d93d34 /rhodecode/model/user.py | |
| parent | e03ad77031ab6c1105c592fb3be9dbf87efd6f3c (diff) | |
Permissions on group can be set in recursive mode setting defined permission to all children
- more explicit permissions
- fixes for empty values in permission form
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
| -rw-r--r-- | rhodecode/model/user.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index bc23c817..48aa403a 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -564,7 +564,7 @@ class UserModel(BaseModel): rg_k = perm.UserRepoGroupToPerm.group.group_name p = perm.Permission.permission_name cur_perm = user.permissions[GK][rg_k] - if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]: + if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm] or 1: # disable check user.permissions[GK][rg_k] = p # REPO GROUP + USER GROUP @@ -588,7 +588,7 @@ class UserModel(BaseModel): cur_perm = user.permissions[GK][g_k] # overwrite permission only if it's greater than permission # given from other sources - if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]: + if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm] or 1: # disable check user.permissions[GK][g_k] = p return user |