diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-03-13 02:39:31 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-03-13 02:39:31 +0200 |
| commit | a979678a8e50443275aa0c1eea2fe66c1938aae6 (patch) | |
| tree | f3fc3c8e6d22d7a4023eac7fb4ebca2b2c9beefe /rhodecode/model/user.py | |
| parent | 0b6ac307b4983403fe39a0fb02927719acceaa47 (diff) | |
fixed #397 Private repository groups shows up before login
- added relevant test for this issue
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
| -rw-r--r-- | rhodecode/model/user.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index d2411c27..f1d59347 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -298,14 +298,15 @@ class UserModel(BaseModel): try: if user.username == 'default': raise DefaultUserException( - _("You can't remove this user since it's" - " crucial for entire application")) + _("You can't remove this user since it's" + " crucial for entire application") + ) if user.repositories: - raise UserOwnsReposException(_('This user still owns %s ' - 'repositories and cannot be ' - 'removed. Switch owners or ' - 'remove those repositories') \ - % user.repositories) + raise UserOwnsReposException( + _('user "%s" still owns %s repositories and cannot be ' + 'removed. Switch owners or remove those repositories') + % (user.username, user.repositories) + ) self.sa.delete(user) except: log.error(traceback.format_exc()) @@ -500,7 +501,7 @@ class UserModel(BaseModel): self.sa.query(UserRepoGroupToPerm, Permission, RepoGroup)\ .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\ - .filter(UserRepoToPerm.user_id == uid)\ + .filter(UserRepoGroupToPerm.user_id == uid)\ .all() for perm in user_repo_groups_perms: @@ -509,7 +510,6 @@ class UserModel(BaseModel): cur_perm = user.permissions[GK][rg_k] if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]: user.permissions[GK][rg_k] = p - return user def has_perm(self, user, perm): |