Add forums to link bar. #383

[zzz-spline-forum.git] / splinext / forum / controllers / forum.py

diff --git a/splinext/forum/controllers/forum.py b/splinext/forum/controllers/forum.py
index 0d1207f..f2eb476 100644 (file)
--- a/splinext/forum/controllers/forum.py
+++ b/splinext/forum/controllers/forum.py
@@ -4,6 +4,7 @@ import math
 
 from pylons import cache, config, request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 
 from pylons import cache, config, request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect

+from pylons.decorators.secure import authenticate_form

 from routes import request_config
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.exc import NoResultFound
 from routes import request_config
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.exc import NoResultFound


@@ -151,7 +152,10 @@ class ForumController(BaseController):
         threads_q = c.forum.threads \
             .join(forum_model.Thread.last_post) \
             .order_by(forum_model.Post.posted_time.desc()) \
         threads_q = c.forum.threads \
             .join(forum_model.Thread.last_post) \
             .order_by(forum_model.Post.posted_time.desc()) \

-            .options(joinedload('last_post.author'))
+            .options(
+                joinedload('last_post'),
+                joinedload('last_post.author'),
+            )

         c.num_threads = threads_q.count()
         try:
             c.skip = int(request.params.get('skip', 0))
         c.num_threads = threads_q.count()
         try:
             c.skip = int(request.params.get('skip', 0))


@@ -197,11 +201,25 @@ class ForumController(BaseController):
             abort(404)
 
         c.write_thread_form = WriteThreadForm(request.params)
             abort(404)
 
         c.write_thread_form = WriteThreadForm(request.params)

+        return render('/forum/write_thread.mako')

 
 

-        if request.method != 'POST' or not c.write_thread_form.validate():
-            # Failure or initial request; show the form
-            return render('/forum/write_thread.mako')
+    @authenticate_form
+    def write_thread_commit(self, forum_id):
+        """Posts a new thread."""
+        if not c.user.can('forum:create-thread'):
+            abort(403)
+
+        try:
+            c.forum = meta.Session.query(forum_model.Forum) \
+                .filter_by(id=forum_id).one()
+        except NoResultFound:
+            abort(404)
+
+        c.write_thread_form = WriteThreadForm(request.params)

 
 

+        # Reshow the form on failure
+        if not c.write_thread_form.validate():
+            return render('/forum/write_thread.mako')

 
         # Otherwise, add the post.
         c.forum = meta.Session.query(forum_model.Forum) \
 
         # Otherwise, add the post.
         c.forum = meta.Session.query(forum_model.Forum) \


@@ -246,11 +264,25 @@ class ForumController(BaseController):
             abort(404)
 
         c.write_post_form = WritePostForm(request.params)
             abort(404)
 
         c.write_post_form = WritePostForm(request.params)

+        return render('/forum/write.mako')

 
 

-        if request.method != 'POST' or not c.write_post_form.validate():
-            # Failure or initial request; show the form
-            return render('/forum/write.mako')
+    @authenticate_form
+    def write_commit(self, forum_id, thread_id):
+        """Post to a thread."""
+        if not c.user.can('forum:create-post'):
+            abort(403)

 
 

+        try:
+            c.thread = meta.Session.query(forum_model.Thread) \
+                .filter_by(id=thread_id, forum_id=forum_id).one()
+        except NoResultFound:
+            abort(404)
+
+        c.write_post_form = WritePostForm(request.params)
+
+        # Reshow the form on failure
+        if not c.write_post_form.validate():
+            return render('/forum/write.mako')

 
         # Otherwise, add the post.
         c.thread = meta.Session.query(forum_model.Thread) \
 
         # Otherwise, add the post.
         c.thread = meta.Session.query(forum_model.Thread) \