Merge remote-tracking branch 'odoo/saas-5' into saas-5-report-translation-fix-sle

[odoo/odoo.git] / addons / website_forum / controllers / main.py

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 2c6e234..89c4a33 100644 (file)
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -120,7 +120,7 @@ class WebsiteForum(http.Controller):
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
         if tag:
-            url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
+            url = "/forum/%s/tag/%s/questions" % (slug(forum), slug(tag))
         else:
             url = "/forum/%s" % slug(forum)
 
@@ -208,12 +208,16 @@ class WebsiteForum(http.Controller):
             }, context=context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), new_question_id))
 
-    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0])]"):question>'''], type='http', auth="public", website=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0]),('parent_id','=',False)]"):question>'''], type='http', auth="public", website=True)
     def question(self, forum, question, **post):
         cr, uid, context = request.cr, request.uid, request.context
         # increment view counter
         request.registry['forum.post'].set_viewed(cr, SUPERUSER_ID, [question.id], context=context)
 
+        if question.parent_id:
+            redirect_url = "/forum/%s/question/%s" % (slug(forum), slug(question.parent_id))
+            return werkzeug.utils.redirect(redirect_url, 301)
+
         filters = 'question'
         values = self._prepare_forum_values(forum=forum, searches=post)
         values.update({