Mercurial > kallithea
changeset 736:ab5c09715127 beta
activated filters for user journal for following users/repos only
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 22 Nov 2010 18:36:32 +0100 |
parents | dbec976d9975 |
children | d5bad4a2432f |
files | rhodecode/controllers/journal.py |
diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/journal.py Mon Nov 22 15:49:04 2010 +0100 +++ b/rhodecode/controllers/journal.py Mon Nov 22 18:36:32 2010 +0100 @@ -31,6 +31,7 @@ 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 @@ -48,9 +49,17 @@ 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')