kallithea Changeset - 229437211bef

Changeset - 229437211bef

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-06 00:27:45
marcin@python-works.com

Optimized queries on journal, and added quick stop following action button in journal

3 files changed with 11 insertions and 3 deletions:

rhodecode/controllers/journal.py

rhodecode/model/db.py

rhodecode/templates/journal/journal.html

0 comments (0 inline, 0 general)

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -30,40 +30,43 @@ from sqlalchemy import or_ @@
 from pylons import request, response, session, tmpl_context as c, url
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.db import UserLog, UserFollowing
 from rhodecode.model.scm import ScmModel
 from paste.httpexceptions import HTTPInternalServerError
 from sqlalchemy.orm import joinedload
 log = logging.getLogger(__name__)
 class JournalController(BaseController):
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(JournalController, self).__before__()
     def index(self):
         # Return a rendered template
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id).all()
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .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]
         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())

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -304,25 +304,25 @@ class UserFollowing(Base, BaseModel): @@
     __table_args__ = (UniqueConstraint('user_id', 'follows_repository_id'),
                       UniqueConstraint('user_id', 'follows_user_id')
                       , {'useexisting':True})
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository')
+    follows_repository = relationship('Repository', order_by='Repository.repo_name')
 class CacheInvalidation(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (UniqueConstraint('cache_key'), {'useexisting':True})
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
     def __init__(self, cache_key, cache_args=''):
         self.cache_key = cache_key

rhodecode/templates/journal/journal.html

➞

Show inline comments

@@ @@ -34,25 +34,30 @@ @@
             <h5>${_('Following')}</h5>
         </div>
         <div>
 		%if c.following:
 		    %for entry in c.following:
 		        <div class="currently_following">
 		            %if entry.follows_user_id:
 		              <img title="${_('following user')}" alt="${_('user')}" src="/images/icons/user.png"/>
 		              ${entry.follows_user.full_contact}
 		            %endif
 		            %if entry.follows_repo_id:
 		              <div style="float:left;padding-right:5px">
                       <span id="follow_toggle_${entry.follows_repository.repo_id}" class="following" title="${_('Stop following this repository')}"
                             onclick="javascript:toggleFollowingRepo(this,${entry.follows_repository.repo_id},'${str(h.get_token())}')">
                       </span>
 		              </div>
 		              %if entry.follows_repository.private:
 		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 		              %else:
 		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 		              %endif
 		              ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',
 		                repo_name=entry.follows_repository.repo_name))}
 		            %endif
 		        </div>
 		    %endfor

0 comments (0 inline, 0 general)