Mercurial > kallithea
diff rhodecode/controllers/journal.py @ 2031:82a88013a3fd
merge 1.3 into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 26 Feb 2012 17:25:09 +0200 |
parents | bf263968da47 a76e9bacbedc |
children | 63e58ef80ef1 |
line wrap: on
line diff
--- a/rhodecode/controllers/journal.py Sun Feb 19 20:21:14 2012 +0200 +++ b/rhodecode/controllers/journal.py Sun Feb 26 17:25:09 2012 +0200 @@ -7,7 +7,7 @@ :created_on: Nov 21, 2010 :author: marcink - :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com> + :copyright: (C) 2010-2012 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 @@ -23,21 +23,24 @@ # 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 itertools import groupby from sqlalchemy import or_ -from sqlalchemy.orm import joinedload, make_transient +from sqlalchemy.orm import joinedload from webhelpers.paginate import Page -from itertools import groupby +from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed from paste.httpexceptions import HTTPBadRequest from pylons import request, tmpl_context as c, response, url from pylons.i18n.translation import _ -from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed import rhodecode.lib.helpers as h from rhodecode.lib.auth import LoginRequired, NotAnonymous from rhodecode.lib.base import BaseController, render -from rhodecode.model.db import UserLog, UserFollowing +from rhodecode.model.db import UserLog, UserFollowing, Repository, User +from rhodecode.model.meta import Session +from sqlalchemy.sql.expression import func +from rhodecode.model.scm import ScmModel log = logging.getLogger(__name__) @@ -58,6 +61,13 @@ # Return a rendered template p = int(request.params.get('page', 1)) + c.user = User.get(self.rhodecode_user.user_id) + all_repos = self.sa.query(Repository)\ + .filter(Repository.user_id == c.user.user_id)\ + .order_by(func.lower(Repository.repo_name)).all() + + c.user_repos = ScmModel().get_repos(all_repos) + c.following = self.sa.query(UserFollowing)\ .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\ .options(joinedload(UserFollowing.follows_repository))\ @@ -124,6 +134,7 @@ try: self.scm_model.toggle_following_user(user_id, self.rhodecode_user.user_id) + Session.commit() return 'ok' except: raise HTTPBadRequest() @@ -133,11 +144,12 @@ try: self.scm_model.toggle_following_repo(repo_id, self.rhodecode_user.user_id) + Session.commit() return 'ok' except: raise HTTPBadRequest() - log.debug('token mismatch %s vs %s', cur_token, token) + log.debug('token mismatch %s vs %s' % (cur_token, token)) raise HTTPBadRequest() @LoginRequired()