[MERGE] sitemap backport, merge trunk from 9438 til 9440

merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py
index 4075479af47..f31e41759db 100644
--- a/addons/website_forum_doc/controllers/main.py
+++ b/addons/website_forum_doc/controllers/main.py
@@ -26,7 +26,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.documentation", value)
 
-    @http.route(['/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post"):post>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc[0])]"):post>'''], type='http', auth="public", website=True, multilang=True)
     def post(self, toc, post, **kwargs):
         # TODO: implement a redirect instead of crash
         assert post.documentation_toc_id.id == toc.id, "Wrong post!"
@@ -42,7 +42,7 @@ class WebsiteDoc(http.Controller):
     def post_toc(self, forum, post, **kwargs):
         cr, uid, context, toc_id = request.cr, request.uid, request.context, False
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
-        assert user.karma >= 200, 'Not enough karma'
+        assert user.karma >= 200, 'You need 200 karma to promote a post to the documentation'
         toc_obj = request.registry['forum.documentation.toc']
         obj_ids = toc_obj.search(cr, uid, [], context=context)
         tocs = toc_obj.browse(cr, uid, obj_ids, context=context)
@@ -57,7 +57,7 @@ class WebsiteDoc(http.Controller):
     def post_toc_ok(self, forum, post_id, toc_id, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
-        assert user.karma >= 200, 'Not enough karma'
+        assert user.karma >= 200, 'Not enough karma, you need 200 to promote a documentation.'
 
         toc_obj = request.registry['forum.documentation.toc']
         stage_ids = toc_obj.search(cr, uid, [], limit=1, context=context)