# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2016-05-23 18:02:33
# Node ID 69750b51813725c210fdb1f08eb46c0be0f88972
# Parent  db2e1fb6aec7fbdaf22097b85a1c05485a2433fa

admin: simplify query for owned and followed repositories

diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py
--- a/kallithea/controllers/admin/my_account.py
+++ b/kallithea/controllers/admin/my_account.py
@@ -75,16 +75,15 @@ class MyAccountController(BaseController
     def _load_my_repos_data(self, watched=False):
         if watched:
             admin = False
-            repos_list = [x.follows_repository for x in
-                          Session().query(UserFollowing).filter(
-                              UserFollowing.user_id ==
-                              self.authuser.user_id).all()]
+            repos_list = Session().query(Repository) \
+                         .join(UserFollowing) \
+                         .filter(UserFollowing.user_id ==
+                                 self.authuser.user_id).all()
         else:
             admin = True
             repos_list = Session().query(Repository) \
                          .filter(Repository.user_id ==
-                                 self.authuser.user_id) \
-                         .order_by(func.lower(Repository.repo_name)).all()
+                                 self.authuser.user_id).all()
 
         repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=admin)