Mercurial > kallithea

comparison rhodecode/controllers/journal.py @ 1175:8c0a57a4b89b beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Journal Should not return 500 errors on failure, rather better is to return bad request error
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 27 Mar 2011 00:23:44 +0100
parents f3f847712f87
children 6832ef664673
comparison
equal deleted inserted replaced
1174:228622715ee9 1175:8c0a57a4b89b
29 from sqlalchemy import or_ 29 from sqlalchemy import or_
30 from sqlalchemy.orm import joinedload, make_transient 30 from sqlalchemy.orm import joinedload, make_transient
31 from webhelpers.paginate import Page 31 from webhelpers.paginate import Page
32 from itertools import groupby 32 from itertools import groupby
33 33
34 from paste.httpexceptions import HTTPInternalServerError 34 from paste.httpexceptions import HTTPBadRequest
35 from pylons import request, tmpl_context as c, response, url 35 from pylons import request, tmpl_context as c, response, url
36 from pylons.i18n.translation import _ 36 from pylons.i18n.translation import _
37 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed 37 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
38 38
39 import rhodecode.lib.helpers as h 39 import rhodecode.lib.helpers as h
130 try: 130 try:
131 self.scm_model.toggle_following_user(user_id, 131 self.scm_model.toggle_following_user(user_id,
132 self.rhodecode_user.user_id) 132 self.rhodecode_user.user_id)
133 return 'ok' 133 return 'ok'
134 except: 134 except:
135 raise HTTPInternalServerError() 135 raise HTTPBadRequest()
136 136
137 repo_id = request.POST.get('follows_repo_id') 137 repo_id = request.POST.get('follows_repo_id')
138 if repo_id: 138 if repo_id:
139 try: 139 try:
140 self.scm_model.toggle_following_repo(repo_id, 140 self.scm_model.toggle_following_repo(repo_id,
141 self.rhodecode_user.user_id) 141 self.rhodecode_user.user_id)
142 return 'ok' 142 return 'ok'
143 except: 143 except:
144 raise HTTPInternalServerError() 144 raise HTTPBadRequest()
145 145
146 146
147 log.debug('token mismatch %s vs %s', cur_token, token) 147 log.debug('token mismatch %s vs %s', cur_token, token)
148 raise HTTPInternalServerError() 148 raise HTTPBadRequest()
149 149
150 150
151 151
152 @LoginRequired() 152 @LoginRequired()
153 def public_journal(self): 153 def public_journal(self):