Changeset - cb216757a62d
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 3
Marcin Kuzminski - 15 years ago 2011-04-23 17:11:12
marcin@python-works.com
#179 Added followers page
6 files changed with 140 insertions and 1 deletions:
rhodecode/config/routing.py
5
rhodecode/controllers/followers.py
57
rhodecode/model/db.py
7
rhodecode/templates/base/base.html
1
1
rhodecode/templates/followers/followers.html
33
rhodecode/templates/followers/followers_data.html
37
0 comments (0 inline, 0 general)
rhodecode/config/routing.py
➞
Show inline comments
 
@@ -240,49 +240,51 @@ def make_map(config):
 
    rmap.connect('search', '/_admin/search', controller='search',)
 
    rmap.connect('search_repo', '/_admin/search/{search_repo:.*}',
 
                  controller='search')
 

			




	
	
	
		
 
    #LOGIN/LOGOUT/REGISTER/SIGN IN

			




	
	
	
		
 
    rmap.connect('login_home', '/_admin/login', controller='login')

			




	
	
	
		
 
    rmap.connect('logout_home', '/_admin/logout', controller='login',

			




	
	
	
		
 
                 action='logout')

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('register', '/_admin/register', controller='login',

			




	
	
	
		
 
                 action='register')

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('reset_password', '/_admin/password_reset',

			




	
	
	
		
 
                 controller='login', action='password_reset')

			




	
	
	
		
 

			




	
	
	
		
 
    #FEEDS

			




	
	
	
		
 
    rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',

			




	
	
	
		
 
                controller='feed', action='rss',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',

			




	
	
	
		
 
                controller='feed', action='atom',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    #REPOSITORY ROUTES

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',

			




	
	
	
		
 
                controller='changeset', revision='tip',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('raw_changeset_home',

			




	
	
	
		
 
                 '/{repo_name:.*}/raw-changeset/{revision}',

			




	
	
	
		
 
                 controller='changeset', action='raw_changeset',

			




	
	
	
		
 
                 revision='tip', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('summary_home', '/{repo_name:.*}',

			




	
	
	
		
 
                controller='summary', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('summary_home', '/{repo_name:.*}/summary',

			




	
	
	
		
 
                controller='summary', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('shortlog_home', '/{repo_name:.*}/shortlog',

			




	
	
	
		
 
                controller='shortlog', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('branches_home', '/{repo_name:.*}/branches',

			




	
	
	
		
 
                controller='branches', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('tags_home', '/{repo_name:.*}/tags',

			




	
	
	
		
 
                controller='tags', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
		
 
@@ -315,25 +317,28 @@ def make_map(config):

			




	
	
	
		
 
    rmap.connect('files_archive_home', '/{repo_name:.*}/archive/{fname}',

			




	
	
	
		
 
                controller='files', action='archivefile',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings',

			




	
	
	
		
 
                controller='settings', action="delete",

			




	
	
	
		
 
                conditions=dict(method=["DELETE"], function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_settings_update', '/{repo_name:.*}/settings',

			




	
	
	
		
 
                controller='settings', action="update",

			




	
	
	
		
 
                conditions=dict(method=["PUT"], function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_settings_home', '/{repo_name:.*}/settings',

			




	
	
	
		
 
                controller='settings', action='index',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork',

			




	
	
	
		
 
                controller='settings', action='fork_create',

			




	
	
	
		
 
                conditions=dict(function=check_repo, method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_fork_home', '/{repo_name:.*}/fork',

			




	
	
	
		
 
                controller='settings', action='fork',

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('repo_followers_home', '/{repo_name:.*}/followers',

			




	
	
	
		
 
                 controller='followers', action='followers',

			




	
	
	
		
 
                 conditions=dict(function=check_repo))

			




	
	
	
		
 
    return rmap

			




        

    


    
    

    

        

                

                    rhodecode/controllers/followers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
# -*- coding: utf-8 -*-

			




	
	
	
		
 
"""

			




	
	
	
		
 
    rhodecode.controllers.followers

			




	
	
	
		
 
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

			




	
	
	
		
 

			




	
	
	
		
 
    Followers controller for rhodecode

			




	
	
	
		
 

			




	
	
	
		
 
    :created_on: Apr 23, 2011

			




	
	
	
		
 
    :author: marcink

			




	
	
	
		
 
    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>

			




	
	
	
		
 
    :license: GPLv3, see COPYING for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 
# This program is free software: you can redistribute it and/or modify

			




	
	
	
		
 
# it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
# the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
# (at your option) any later version.

			




	
	
	
		
 
#

			




	
	
	
		
 
# This program is distributed in the hope that it will be useful,

			




	
	
	
		
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
# GNU General Public License for more details.

			




	
	
	
		
 
#

			




	
	
	
		
 
# You should have received a copy of the GNU General Public License

			




	
	
	
		
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
import logging

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import tmpl_context as c, request

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.helpers import Page

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from rhodecode.lib.base import BaseRepoController, render

			




	
	
	
		
 
from rhodecode.model.db import Repository, User, UserFollowing

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class FollowersController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(FollowersController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def followers(self, repo_name):

			




	
	
	
		
 
        p = int(request.params.get('page', 1))

			




	
	
	
		
 
        repo_id = getattr(Repository.by_repo_name(repo_name), 'repo_id')

			




	
	
	
		
 
        d = UserFollowing.get_repo_followers(repo_id)\

			




	
	
	
		
 
            .order_by(UserFollowing.follows_from)

			




	
	
	
		
 
        c.followers_pager = Page(d, page=p, items_per_page=20)

			




	
	
	
		
 

			




	
	
	
		
 
        c.followers_data = render('/followers/followers_data.html')

			




	
	
	
		
 

			




	
	
	
		
 
        if request.params.get('partial'):

			




	
	
	
		
 
            return c.followers_data

			




	
	
	
		
 

			




	
	
	
		
 
        return render('/followers/followers.html')

			




        

    


    
    

    

        

                

                    rhodecode/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -466,54 +466,61 @@ class GroupToPerm(Base):

			




	
	
	
		
 
    group = relationship('Group')

			




	
	
	
		
 

			




	
	
	
		
 
class Statistics(Base):

			




	
	
	
		
 
    __tablename__ = 'statistics'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('repository_id'), {'useexisting':True})

			




	
	
	
		
 
    stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)

			




	
	
	
		
 
    commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data

			




	
	
	
		
 
    commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data

			




	
	
	
		
 
    languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data

			




	
	
	
		
 

			




	
	
	
		
 
    repository = relationship('Repository', single_parent=True)

			




	
	
	
		
 

			




	
	
	
		
 
class UserFollowing(Base):

			




	
	
	
		
 
    __tablename__ = 'user_followings'

			




	
	
	
		
 
    __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)

			




	
	
	
		
 
    follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)

			




	
	
	
		
 

			




	
	
	
		
 
    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', order_by='Repository.repo_name')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_repo_followers(cls, repo_id):

			




	
	
	
		
 
        return Session.query(cls).filter(cls.follows_repo_id == repo_id)

			




	
	
	
		
 

			




	
	
	
		
 
class CacheInvalidation(Base):

			




	
	
	
		
 
    __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=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    cache_args = Column("cache_args", String(length=255, 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

			




	
	
	
		
 
        self.cache_args = cache_args

			




	
	
	
		
 
        self.cache_active = False

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<%s('%s:%s')>" % (self.__class__.__name__,

			




	
	
	
		
 
                                  self.cache_id, self.cache_key)

			




	
	
	
		
 

			




	
	
	
		
 
class DbMigrateVersion(Base):

			




	
	
	
		
 
    __tablename__ = 'db_migrate_version'

			




	
	
	
		
 
    __table_args__ = {'useexisting':True}

			




	
	
	
		
 
    repository_id = Column('repository_id', String(250), primary_key=True)

			




	
	
	
		
 
    repository_path = Column('repository_path', Text)

			




	
	
	
		
 
    version = Column('version', Integer)

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -269,49 +269,49 @@

			




	
	
	
		
 
                    

			




	
	
	
		
 
                    %if h.HasPermissionAll('hg.admin')('access admin main page'):

			




	
	
	
		
 
                    <li>

			




	
	
	
		
 
                       ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}  

			




	
	
	
		
 
                        <%def name="admin_menu()">

			




	
	
	
		
 
                        <ul>

			




	
	
	
		
 
                            <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>

			




	
	
	
		
 
                            <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>

			




	
	
	
		
 
                            <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>

			




	
	
	
		
 
                            <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li>

			




	
	
	
		
 
                            <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>

			




	
	
	
		
 
                            <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>

			




	
	
	
		
 
                            <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        

			




	
	
	
		
 
                        </ul>

			




	
	
	
		
 
                        </%def>

			




	
	
	
		
 
                        

			




	
	
	
		
 
                        ${admin_menu()}

			




	
	
	
		
 
                    </li>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 

			




	
	
	
		
 
                   </ul>             

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
                

			




	
	
	
		
 
                <li>

			




	
	
	
		
 
                    <a title="${_('Followers')}" href="#">

			




	
	
	
		
 
                    <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">

			




	
	
	
		
 
                    <span class="icon_short">

			




	
	
	
		
 
                        <img src="${h.url("/images/icons/heart.png")}" alt="${_('Followers')}" />

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span id="current_followers_count" class="short">${c.repository_followers}</span>

			




	
	
	
		
 
                    </a>

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
                <li>

			




	
	
	
		
 
                    <a title="${_('Forks')}" href="#">

			




	
	
	
		
 
                    <span class="icon_short">

			




	
	
	
		
 
                        <img src="${h.url("/images/icons/arrow_divide.png")}" alt="${_('Forks')}" />

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span class="short">${c.repository_forks}</span>

			




	
	
	
		
 
                    </a>

			




	
	
	
		
 
                </li>                

			




	
	
	
		
 
                

			




	
	
	
		
 
                

			




	
	
	
		
 
                

			




	
	
	
		
 
	        </ul>

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
		    ##ROOT MENU

			




	
	
	
		
 
            <ul id="quick">

			




	
	
	
		
 
                <li>

			




	
	
	
		
 
                    <a title="${_('Home')}"  href="${h.url('home')}">

			




	
	
	
		
 
                    <span class="icon">

			




        

    


    
    

    

        

                

                    rhodecode/templates/followers/followers.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('Followers')} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(u'Home',h.url('/'))}

			




	
	
	
		
 
    &raquo; 

			




	
	
	
		
 
    ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('followers')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('followers')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="followers">

			




	
	
	
		
 
            ${c.followers_data}

			




	
	
	
		
 
        </div>   

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




	
	
	
		
 
</%def> 

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/templates/followers/followers_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
% for f in c.followers_pager:

			




	
	
	
		
 
    <div>

			




	
	
	
		
 
        <div class="follower_user">

			




	
	
	
		
 
            <div class="gravatar">

			




	
	
	
		
 
                <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
        <div class="follower_date">${_('Started following on')} - ${f.follows_from}</div>

			




	
	
	
		
 
        <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>

			




	
	
	
		
 
    </div>                

			




	
	
	
		
 
% endfor 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<div class="pagination-wh pagination-left">

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
  var data_div = 'followers';

			




	
	
	
		
 
  YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
    YAHOO.util.Event.addListener(

			




	
	
	
		
 
    		YUD.getElementsByClassName('pager_link'),"click",

			




	
	
	
		
 
    		function(){

			




	
	
	
		
 
            YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');

			




	
	
	
		
 
            });

			




	
	
	
		
 
    });

			




	
	
	
		
 
</script>

			




	
	
	
		
 

			




	
	
	
		
 
${c.followers_pager.pager('$link_previous ~2~ $link_next',     

			




	
	
	
		
 
onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{

			




	
	
	
		
 
success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;

			




	
	
	
		
 
YUE.on(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){

			




	
	
	
		
 
        YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});       

			




	
	
	
		
 
YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}

			




	
	
	
		
 
</div>

			




	
	
		
 
\ No newline at end of file

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.