From 335ffaa6fd6e775aa9d94dd2ace2bfedad032029 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 25 Apr 2017 08:38:38 +0200 Subject: [PATCH] users: personal repo-group shouldn't be available for default user. --- rhodecode/model/db.py | 5 ++++- rhodecode/model/user.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index 0991eaa9..ea065bb9 100644 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -2208,8 +2208,11 @@ class RepoGroup(Base, BaseModel): @classmethod def get_user_personal_repo_group(cls, user_id): user = User.get(user_id) + if user.username == User.DEFAULT_USER: + return None + return cls.query()\ - .filter(cls.personal == true())\ + .filter(cls.personal == true()) \ .filter(cls.user == user).scalar() @classmethod diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index d398eb0e..4aa7fb18 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -669,7 +669,8 @@ class UserModel(BaseModel): user_id, api_key, username) return False if not dbuser.active: - log.debug('User `%s` is inactive, skipping fill data', username) + log.debug('User `%s:%s` is inactive, skipping fill data', + username, user_id) return False log.debug('filling user:%s data', dbuser)