Files
@ 136af52f374b
Branch filter:
Location: kallithea/rhodecode/controllers/journal.py - annotation
136af52f374b
3.2 KiB
text/x-python
merged found bugs and fixed for stable release:
- added force https option into ini files for easier https usage (no need to
set server headers with this options)
- small css updates
- fixed #96 redirect loop on files view on repositories without changesets
- fixed #97 unicode string passed into server header in special cases (mod_wsgi)
and server crashed with errors
- fixed large tooltips problems on main page
- fixed #92 whoosh indexer is more error proof
- added force https option into ini files for easier https usage (no need to
set server headers with this options)
- small css updates
- fixed #96 redirect loop on files view on repositories without changesets
- fixed #97 unicode string passed into server header in special cases (mod_wsgi)
and server crashed with errors
- fixed large tooltips problems on main page
- fixed #92 whoosh indexer is more error proof
fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 fd2ea6ceadc8 fd2ea6ceadc8 fd2ea6ceadc8 49eb69d78988 49eb69d78988 fd2ea6ceadc8 3025b0f9475e 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 fd2ea6ceadc8 fd2ea6ceadc8 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 3025b0f9475e 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 3025b0f9475e 3025b0f9475e ab5c09715127 3025b0f9475e ab5c09715127 3025b0f9475e 49eb69d78988 ab5c09715127 ab5c09715127 ab5c09715127 ab5c09715127 49eb69d78988 ddaddffcb7dc 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 49eb69d78988 | # -*- coding: utf-8 -*-
"""
rhodecode.controllers.journal
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Journal controller for pylons
:created_on: Nov 21, 2010
:author: marcink
:copyright: (C) 2009-2010 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; 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.
import logging
from sqlalchemy import or_
from pylons import request, response, session, tmpl_context as c, url
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
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()
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())\
.limit(20)\
.all()
return render('/journal.html')
def toggle_following(self):
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()
|