kallithea Changeset - e4b7cfeb2eea

Changeset - e4b7cfeb2eea

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2011-02-10 23:39:57
marcin@python-works.com

optimized filtering on journal

1 file changed with 14 insertions and 5 deletions:

rhodecode/controllers/journal.py

0 comments (0 inline, 0 general)

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -64,13 +64,22 @@ class JournalController(BaseController): @@
         user_ids = [x.follows_user.user_id for x in c.following
                     if x.follows_user is not None]
         filtering_criterion = None
         if repo_ids and user_ids:
             filtering_criterion = or_(UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids))
         if repo_ids and not user_ids:
             filtering_criterion = UserLog.repository_id.in_(repo_ids)
         if not repo_ids and user_ids:
             filtering_criterion = UserLog.user_id.in_(user_ids)
         if filtering_criterion is not None:
         journal = self.sa.query(UserLog)\
             .filter(or_(
                         UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids),
                         ))\
                 .filter(filtering_criterion)\
             .order_by(UserLog.action_date.desc())
         else:
             journal = []
         p = int(request.params.get('page', 1))
         c.journal_pager = Page(journal, page=p, items_per_page=10)

0 comments (0 inline, 0 general)