kallithea Changeset - 873a3839865d

Changeset - 873a3839865d

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Søren Løvborg - 9 years ago 2016-09-14 15:52:26
sorenl@unity3d.com

db: add a Repository.query() shortcut

5 files changed with 18 insertions and 15 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/repos.py

kallithea/controllers/home.py

kallithea/controllers/journal.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -309,10 +309,7 @@ class RepoGroupsController(BaseControlle @@
             .filter(RepoGroup.group_parent_id == c.group.group_id).all()
         c.groups = self.scm_model.get_repo_groups(groups)
         c.repos_list = Repository.query() \
                         .filter(Repository.group_id == c.group.group_id) \
                         .order_by(func.lower(Repository.repo_name)) \
                         .all()
         c.repos_list = Repository.query(sorted=True).filter_by(group=c.group).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                    admin=False, short_name=True)

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -98,9 +98,7 @@ class ReposController(BaseRepoController @@
         return defaults
     def index(self, format='html'):
         _list = Repository.query() \
                         .order_by(func.lower(Repository.repo_name)) \
                         .all()
         _list = Repository.query(sorted=True).all()
         c.repos_list = RepoList(_list, perm_set=['repository.admin'])
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,

kallithea/controllers/home.py

➞

Show inline comments

@@ @@ -57,10 +57,7 @@ class HomeController(BaseController): @@
         c.groups = self.scm_model.get_repo_groups()
         c.group = None
         c.repos_list = Repository.query() \
                         .filter(Repository.group_id == None) \
                         .order_by(func.lower(Repository.repo_name)) \
                         .all()
         c.repos_list = Repository.query(sorted=True).filter_by(group=None).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                    admin=False, short_name=True)

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -211,10 +211,8 @@ class JournalController(BaseController): @@
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('journal/journal_data.html')
         repos_list = Session().query(Repository) \
                      .filter(Repository.user_id ==
                              self.authuser.user_id) \
                      .order_by(func.lower(Repository.repo_name)).all()
         repos_list = Repository.query(sorted=True) \
             .filter_by(user_id=self.authuser.user_id).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=True)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1090,6 +1090,19 @@ class Repository(Base, BaseModel): @@
             log.error(traceback.format_exc())
     @classmethod
     def query(cls, sorted=False):
         """Add Repository-specific helpers for common query constructs.
         sorted: if True, apply the default ordering (name, case insensitive).
         """
         q = super(Repository, cls).query()
         if sorted:
             q = q.order_by(func.lower(Repository.repo_name))
         return q
     @classmethod
     def url_sep(cls):
         return URL_SEP

0 comments (0 inline, 0 general)