kallithea Changeset - d8ad71e7b90d

Changeset - d8ad71e7b90d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

usergroup: explicitly use subqueryload instead of relying on lazy=join

1 file changed with 6 insertions and 3 deletions:

kallithea/model/repo.py

0 comments (0 inline, 0 general)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -32,8 +32,9 @@ import shutil @@
 import logging
 import traceback
 from datetime import datetime
 from sqlalchemy.orm import subqueryload
 from kallithea.lib.utils import make_ui
 from kallithea.lib.vcs.backends import get_backend
 from kallithea.lib.compat import json
 from kallithea.lib.utils2 import LazyProperty, safe_str, safe_unicode, \
@@ @@ -44,7 +45,7 @@ from kallithea.lib.hooks import log_dele @@
 from kallithea.model import BaseModel
 from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \
     UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \
     Statistics, UserGroup, Ui, RepoGroup, \
+    Statistics, UserGroup, UserGroupMember, Ui, RepoGroup, \
     Setting, RepositoryField
 from kallithea.lib import helpers as h
@@ @@ -146,7 +147,9 @@ class RepoModel(BaseModel): @@
     def get_user_groups_js(self):
         user_groups = self.sa.query(UserGroup) \
             .filter(UserGroup.users_group_active == True).all()
             .filter(UserGroup.users_group_active == True) \
             .options(subqueryload(UserGroup.members)) \
             .all()
         user_groups = UserGroupList(user_groups, perm_set=['usergroup.read',
                                                            'usergroup.write',
                                                            'usergroup.admin'])

0 comments (0 inline, 0 general)