Mercurial > kallithea

comparison rhodecode/model/user.py @ 2877:d6ac3baaa15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged beta into stable
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 28 Sep 2012 23:28:10 +0200
parents f7a52d548fd0 5c1ad3b410e5
children a5f0bc867edc
comparison
equal deleted inserted replaced
2855:79fdfd0afdf8 2877:d6ac3baaa15a
522 for perm in user_repo_perms_from_users_groups: 522 for perm in user_repo_perms_from_users_groups:
523 r_k = perm.UsersGroupRepoToPerm.repository.repo_name 523 r_k = perm.UsersGroupRepoToPerm.repository.repo_name
524 p = perm.Permission.permission_name 524 p = perm.Permission.permission_name
525 cur_perm = user.permissions[RK][r_k] 525 cur_perm = user.permissions[RK][r_k]
526 # overwrite permission only if it's greater than permission 526 # overwrite permission only if it's greater than permission
527 # given from other sources 527 # given from other sources - disabled with `or 1` now
528 if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm] or 1: # disable check 528 if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm] or 1: # disable check
529 if perm.Repository.user_id == uid:
530 # set admin if owner
531 p = 'repository.admin'
532
529 user.permissions[RK][r_k] = p 533 user.permissions[RK][r_k] = p
530 534
531 # user explicit permissions for repositories 535 # user explicit permissions for repositories
532 user_repo_perms = \ 536 user_repo_perms = \
533 self.sa.query(UserRepoToPerm, Permission, Repository)\ 537 self.sa.query(UserRepoToPerm, Permission, Repository)\