Mercurial > kallithea
diff rhodecode/model/user.py @ 3415:b8f929bff7e3 beta
fixed tests and missing replacements from 5f1850e4712a
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 27 Feb 2013 02:27:09 +0100 |
| parents | 5f1850e4712a |
| children | fa6ba6727475 |
line wrap: on
line diff
--- a/rhodecode/model/user.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/model/user.py Wed Feb 27 02:27:09 2013 +0100 @@ -512,7 +512,7 @@ 'hg.create.none', 'hg.create.repository']) # USER GROUPS comes first - # users group global permissions + # user group global permissions user_perms_from_users_groups = self.sa.query(UsersGroupToPerm)\ .options(joinedload(UsersGroupToPerm.permission))\ .join((UsersGroupMember, UsersGroupToPerm.users_group_id == @@ -559,7 +559,7 @@ # permission should be selected based on selected method #====================================================================== - # users group for repositories permissions + # user group for repositories permissions user_repo_perms_from_users_groups = \ self.sa.query(UsersGroupRepoToPerm, Permission, Repository,)\ .join((Repository, UsersGroupRepoToPerm.repository_id == @@ -617,7 +617,7 @@ # fill in his permission from it. _choose_perm decides of which # permission should be selected based on selected method #====================================================================== - # users group for repo groups permissions + # user group for repo groups permissions user_repo_group_perms_from_users_groups = \ self.sa.query(UsersGroupRepoGroupToPerm, Permission, RepoGroup)\ .join((RepoGroup, UsersGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\