X-Git-Url: http://git.veekun.com/zzz-spline-forum.git/blobdiff_plain/0bdf4461e31fce365e9fbc2e0784e634d2431a0e..39c2141c656650e7624d34f8f4bf6c28dbce0981:/splinext/forum/controllers/forum.py diff --git a/splinext/forum/controllers/forum.py b/splinext/forum/controllers/forum.py index 342e8e6..6cd4bfb 100644 --- a/splinext/forum/controllers/forum.py +++ b/splinext/forum/controllers/forum.py @@ -1,7 +1,7 @@ import logging from pylons import config, request, response, session, tmpl_context as c, url -from pylons.controllers.util import abort, redirect_to +from pylons.controllers.util import abort, redirect from routes import request_config from sqlalchemy.orm.exc import NoResultFound import wtforms @@ -29,9 +29,8 @@ class ForumController(BaseController): return render('/forum/forums.mako') def threads(self, forum_id): - try: - c.forum = meta.Session.query(forum_model.Forum).get(forum_id) - except NoResultFound: + c.forum = meta.Session.query(forum_model.Forum).get(forum_id) + if not c.forum: abort(404) c.write_thread_form = WriteThreadForm() @@ -93,9 +92,11 @@ class ForumController(BaseController): # Redirect to the new thread h.flash("Contribution to the collective knowledge of the species successfully recorded.") - redirect_to(controller='forum', action='posts', - forum_id=forum_id, thread_id=thread.id, - _code=303) + redirect( + url(controller='forum', action='posts', + forum_id=forum_id, thread_id=thread.id), + code=303, + ) def write(self, forum_id, thread_id): """Provides a form for posting to a thread.""" @@ -134,6 +135,8 @@ class ForumController(BaseController): # Redirect to the thread # XXX probably to the post instead; anchor? depends on paging scheme h.flash('Your uniqueness has been added to our own.') - redirect_to(controller='forum', action='posts', - forum_id=forum_id, thread_id=thread_id, - _code=303) + redirect( + url(controller='forum', action='posts', + forum_id=forum_id, thread_id=thread_id), + code=303, + )