# HG changeset patch # User Marcin Kuzminski # Date 2010-11-22 02:57:47 # Node ID 49eb69d789880d5a4fb4db3c38bccf39b93eda71 # Parent ac701b421053aaade71dbe9c3dadad9432374ae6 implemented user dashboards, and following system. diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -124,6 +124,14 @@ def make_map(config): m.connect('admin_home', '', action='index')#main page m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}', action='add_repo') + + + #USER JOURNAL + map.connect('journal', '/_admin/journal', controller='journal',) + map.connect('toggle_following', '/_admin/toggle_following', controller='journal', + action='toggle_following', conditions=dict(method=["POST"])) + + #SEARCH map.connect('search', '/_admin/search', controller='search',) map.connect('search_repo', '/_admin/search/{search_repo:.*}', controller='search') diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py new file mode 100644 --- /dev/null +++ b/rhodecode/controllers/journal.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# encoding: utf-8 +# journal controller for pylons +# Copyright (C) 2009-2010 Marcin Kuzminski +# +# 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; version 2 +# of the License or (at your opinion) any later version of the license. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +""" +Created on November 21, 2010 +journal controller for pylons +@author: marcink +""" + +from pylons import request, response, session, tmpl_context as c, url +from pylons.controllers.util import abort, redirect +from rhodecode.lib.auth import LoginRequired +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 +import logging +from paste.httpexceptions import HTTPInternalServerError, HTTPNotFound + +log = logging.getLogger(__name__) + +class JournalController(BaseController): + + + @LoginRequired() + 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() + + + c.journal = self.sa.query(UserLog)\ + .order_by(UserLog.action_date.desc())\ + .all() + return render('/journal.html') + + + def toggle_following(self): + print c.rhodecode_user + + if request.POST.get('auth_token') == get_token(): + scm_model = ScmModel() + + user_id = request.POST.get('follows_user_id') + if user_id: + try: + scm_model.toggle_following_user(user_id, + c.rhodecode_user.user_id) + return 'ok' + except: + raise HTTPInternalServerError() + + repo_id = request.POST.get('follows_repo_id') + if repo_id: + try: + scm_model.toggle_following_repo(repo_id, + c.rhodecode_user.user_id) + return 'ok' + except: + raise HTTPInternalServerError() + + + + raise HTTPInternalServerError() diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py +++ b/rhodecode/controllers/summary.py @@ -52,8 +52,10 @@ class SummaryController(BaseController): super(SummaryController, self).__before__() def index(self): - hg_model = ScmModel() - c.repo_info = hg_model.get_repo(c.repo_name) + scm_model = ScmModel() + c.repo_info = scm_model.get_repo(c.repo_name) + c.following = scm_model.is_following_repo(c.repo_name, + c.rhodecode_user.user_id) def url_generator(**kw): return url('shortlog_home', repo_name=c.repo_name, **kw) diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -3,6 +3,8 @@ Consists of functions to typically be used within templates, but also available to Controllers. This module is available to both as 'h'. """ +import random +import hashlib from pygments.formatters import HtmlFormatter from pygments import highlight as code_highlight from pylons import url, app_globals as g @@ -36,6 +38,24 @@ def _reset(name, value=None, id=NotGiven reset = _reset + +def get_token(): + """Return the current authentication token, creating one if one doesn't + already exist. + """ + token_key = "_authentication_token" + from pylons import session + if not token_key in session: + try: + token = hashlib.sha1(str(random.getrandbits(128))).hexdigest() + except AttributeError: # Python < 2.4 + token = hashlib.sha1(str(random.randrange(2 ** 128))).hexdigest() + session[token_key] = token + if hasattr(session, 'save'): + session.save() + return session[token_key] + + #Custom helpers here :) class _Link(object): ''' @@ -415,10 +435,10 @@ def action_parser(user_log): cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]), _('and %s more revisions') \ % (len(revs) - revs_limit)) - + return literal(cs_links) return '' - + def get_fork_name(): if action == 'user_forked_repo': from rhodecode.model.scm import ScmModel diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -49,6 +49,7 @@ class User(Base): user_perms = relation('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all') repositories = relation('Repository') + user_followers = relation('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all') @LazyProperty def full_contact(self): @@ -101,6 +102,9 @@ class Repository(Base): repo_to_perm = relation('RepoToPerm', cascade='all') stats = relation('Statistics', cascade='all', uselist=False) + repo_followers = relation('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all') + + def __repr__(self): return "" % (self.repo_id, self.repo_name) @@ -148,6 +152,23 @@ class Statistics(Base): repository = relation('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(u'users.user_id'), nullable=False, unique=None, default=None) + follows_repo_id = Column("follows_repository_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=True, unique=None, default=None) + follows_user_id = Column("follows_user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None) + + user = relation('User', primaryjoin='User.user_id==UserFollowing.user_id') + + follows_user = relation('User', primaryjoin='User.user_id==UserFollowing.follows_user_id') + follows_repository = relation('Repository') + + class CacheInvalidation(Base): __tablename__ = 'cache_invalidation' __table_args__ = (UniqueConstraint('cache_key'), {'useexisting':True}) @@ -163,4 +184,4 @@ class CacheInvalidation(Base): self.cache_active = False def __repr__(self): - return "" % (self.cache_id, self.cache_key) + return "" % (self.cache_id, self.cache_key) diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py --- a/rhodecode/model/scm.py +++ b/rhodecode/model/scm.py @@ -29,7 +29,8 @@ from rhodecode.lib import helpers as h from rhodecode.lib.auth import HasRepoPermissionAny from rhodecode.lib.utils import get_repos, make_ui from rhodecode.model import meta -from rhodecode.model.db import Repository, User, RhodeCodeUi, CacheInvalidation +from rhodecode.model.db import Repository, User, RhodeCodeUi, CacheInvalidation, \ + UserFollowing from rhodecode.model.caching_query import FromCache from sqlalchemy.orm import joinedload from sqlalchemy.orm.session import make_transient @@ -219,7 +220,79 @@ class ScmModel(object): self.sa.rollback() + def toggle_following_repo(self, follow_repo_id, user_id): + f = self.sa.query(UserFollowing)\ + .filter(UserFollowing.follows_repo_id == follow_repo_id)\ + .filter(UserFollowing.user_id == user_id).scalar() + + if f is not None: + try: + self.sa.delete(f) + self.sa.commit() + return + except: + log.error(traceback.format_exc()) + self.sa.rollback() + raise + + + try: + f = UserFollowing() + f.user_id = user_id + f.follows_repo_id = follow_repo_id + self.sa.add(f) + self.sa.commit() + except: + log.error(traceback.format_exc()) + self.sa.rollback() + raise + + def toggle_following_user(self, follow_user_id , user_id): + f = self.sa.query(UserFollowing)\ + .filter(UserFollowing.follows_user_id == follow_user_id)\ + .filter(UserFollowing.user_id == user_id).scalar() + + if f is not None: + try: + self.sa.delete(f) + self.sa.commit() + return + except: + log.error(traceback.format_exc()) + self.sa.rollback() + raise + + try: + f = UserFollowing() + f.user_id = user_id + f.follows_user_id = follow_user_id + self.sa.add(f) + self.sa.commit() + except: + log.error(traceback.format_exc()) + self.sa.rollback() + raise + + def is_following_repo(self, repo_name, user_id): + r = self.sa.query(Repository)\ + .filter(Repository.repo_name == repo_name).scalar() + + f = self.sa.query(UserFollowing)\ + .filter(UserFollowing.follows_repository == r)\ + .filter(UserFollowing.user_id == user_id).scalar() + + return f is not None + + def is_following_user(self, username, user_id): + u = self.sa.query(User)\ + .filter(User.username == username).scalar() + + f = self.sa.query(UserFollowing)\ + .filter(UserFollowing.follows_user == u)\ + .filter(UserFollowing.user_id == user_id).scalar() + + return f is not None def _should_invalidate(self, repo_name): diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1776,6 +1776,26 @@ background:#556CB5; color:#FFF; } +.follow{ +background:url("../images/icons/heart_add.png") no-repeat scroll 3px; +height: 16px; +width: 20px; +cursor: pointer; +display: block; +float: right; +margin-top: 2px; +} + +.following{ +background:url("../images/icons/heart_delete.png") no-repeat scroll 3px; +height: 16px; +width: 20px; +cursor: pointer; +display: block; +float: right; +margin-top: 2px; +} + .add_icon { background:url("../images/icons/add.png") no-repeat scroll 3px; height:16px; diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -239,6 +239,15 @@
  • + + + ${_('Journal')} + + ${_('Journal')} + +
    • + +
  • ${_('Search')} @@ -286,6 +295,50 @@ + + + + <%def name="breadcrumbs()"> diff --git a/rhodecode/templates/journal.html b/rhodecode/templates/journal.html new file mode 100644 --- /dev/null +++ b/rhodecode/templates/journal.html @@ -0,0 +1,80 @@ +## -*- coding: utf-8 -*- +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('Journal')} - ${c.rhodecode_name} + +<%def name="breadcrumbs()"> + ${c.rhodecode_name} + +<%def name="page_nav()"> + ${self.menu('home')} + +<%def name="main()"> + +
    + +
    +
    ${_('Journal')}
    +
    +
    + %if c.journal: + %for entry in c.journal: +
    +
    + gravatar +
    +
    ${entry.user.name} ${entry.user.lastname}
    +
    ${h.action_parser(entry)}
    + + %if entry.repository: + ${h.link_to(entry.repository.repo_name, + h.url('summary_home',repo_name=entry.repository.repo_name))} + %else: + ${entry.repository_name} + %endif + - ${h.age(entry.action_date)} +
    +
    +
    + %endfor + %else: + ${_('No entries yet')} + %endif +
    +
    + +
    + +
    +
    ${_('Following')}
    +
    +
    + %if c.following: + %for entry in c.following: +
    + %if entry.follows_user_id: + + + ${entry.follows_user.username} + %endif + + %if entry.follows_repo_id: + + %if entry.follows_repository.private: + + %else: + + %endif + + ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home', + repo_name=entry.follows_repository.repo_name))} + + %endif +
    + %endfor + %else: + ${_('You are not following any users or repositories')} + %endif +
    +
    + diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -55,6 +55,16 @@ E.onDOMReady(function(e){ ${_('public repository')} %endif ${c.repo_info.name} + + %if c.following: + + + %else: + + %endif
    %if c.repo_info.dbrepo.fork: diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py --- a/rhodecode/tests/functional/test_files.py +++ b/rhodecode/tests/functional/test_files.py @@ -73,10 +73,6 @@ class TestFilesController(TestController revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc', f_path='vcs/nodes.py')) - - - #tests... - #test or history assert """