diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2013-02-27 02:27:09 +0100 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2013-02-27 02:27:09 +0100 |
| commit | 12a7544624b4ee5d7e6c7c109d52be2b7b36747b (patch) | |
| tree | b34d6ba4333324dd8837025ef77303553c7d3622 /rhodecode/model/user.py | |
| parent | 5001b04aa7cd6e925d90adcde9858fe550d08271 (diff) | |
fixed tests and missing replacements from 5f1850e4712a
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
| -rw-r--r-- | rhodecode/model/user.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 218b4d0f..c92833a3 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -512,7 +512,7 @@ class UserModel(BaseModel): '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 @@ class UserModel(BaseModel): # 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 @@ class UserModel(BaseModel): # 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))\ |