diff --git a/rhodecode/controllers/admin/users_groups.py b/rhodecode/controllers/admin/users_groups.py --- a/rhodecode/controllers/admin/users_groups.py +++ b/rhodecode/controllers/admin/users_groups.py @@ -173,7 +173,6 @@ class UsersGroupsController(BaseControll c.users_group.permissions = {} c.group_members = [(x.user_id, x.user.username) for x in c.users_group.members] - print c.group_members, 'x' * 100 c.available_members = [(x.user_id, x.username) for x in self.sa.query(User).all()] defaults = c.users_group.get_dict() diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -162,7 +162,7 @@ class UsersGroup(Base, BaseModel): users_group_name = Column("users_group_name", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None) users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None) - members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan") + members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined") class UsersGroupMember(Base, BaseModel): __tablename__ = 'users_groups_members' @@ -172,7 +172,7 @@ class UsersGroupMember(Base, BaseModel): users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - user = relationship('User') + user = relationship('User', lazy='joined') users_group = relationship('UsersGroup') def __init__(self, gr_id, u_id): diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -37,7 +37,7 @@ %for cnt,u_group in enumerate(c.users_groups_list):