kallithea Changeset - ab5c09715127

Changeset - ab5c09715127

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2010-11-22 18:36:32
marcin@python-works.com

activated filters for user journal for following users/repos only

1 file changed with 9 insertions and 0 deletions:

rhodecode/controllers/journal.py

0 comments (0 inline, 0 general)

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -31,6 +31,7 @@ from rhodecode.lib.helpers import get_to @@
 from rhodecode.lib.utils import action_logger
 from rhodecode.model.db import UserLog, UserFollowing
 from rhodecode.model.scm import ScmModel
 from sqlalchemy import or_
 import logging
 from paste.httpexceptions import HTTPInternalServerError, HTTPNotFound
@@ @@ -49,8 +50,16 @@ class JournalController(BaseController): @@
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id).all()
         repo_ids = [x.follows_repository.repo_id for x in c.following
                     if x.follows_repository is not None]
         user_ids = [x.follows_user.user_id for x in c.following
                     if x.follows_user is not None]
         c.journal = self.sa.query(UserLog)\
             .filter(or_(
                         UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids),
                         ))\
             .order_by(UserLog.action_date.desc())\
             .all()
         return render('/journal.html')

0 comments (0 inline, 0 general)