From 3c97dbf1e10603e537e858d2c01a64ecffa4d1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Fri, 25 Sep 2015 11:39:01 +0200
Subject: [PATCH] [FIX] website_blog : use website_mail mechanism to post
 message

Using website_mail mecanism will prevent to transform POST params into GET params when redirecting. This will reasure xmo ;)
---
 addons/website_blog/controllers/main.py       |  9 ----
 .../views/website_blog_templates.xml          | 43 +++----------------
 2 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index e3d95496d40..2bd200ea303 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -279,15 +279,6 @@ class WebsiteBlog(http.Controller):
             context=context)
         return message_id
 
-    @http.route(['/blog/post_comment/<int:blog_post_id>'], type='http', auth="user", methods=['POST'], website=True)
-    def blog_post_comment(self, blog_post_id=0, **kw):
-        cr, uid, context = request.cr, request.uid, request.context
-        if kw.get('comment'):
-            self._blog_post_message(blog_post_id, kw.get('comment'), **kw)
-        blog_post = request.registry['blog.post'].browse(cr, uid, blog_post_id, context=context)
-        return werkzeug.utils.redirect("/blog/%s/post/%s#comments" % (slug(blog_post.blog_id), slug(blog_post)))
-
-
     def _get_discussion_detail(self, ids, publish=False, **post):
         cr, uid, context = request.cr, request.uid, request.context
         values = []
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 599545ecea9..1113e267cb5 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -225,25 +225,6 @@
         <div id="blog_content" t-field="blog_post.content" class="blog_content mt32"/>
 
 
-    <section id="comments" class="read_width">
-        <hr t-if="comments"/>
-        <ul class="media-list" id="comments-list">
-            <li t-foreach="comments" t-as="message" class="media">
-                <span class="pull-left">
-                    <img t-if="message.author_avatar" class="media-object img img-circle" t-att-src="website.image_url(message, 'author_avatar')" style="width: 30px"/>
-                </span>
-                <div class="media-body">
-                    <t t-call="website.publish_short">
-                        <t t-set="object" t-value="message"/>
-                    </t>
-                    <strong t-field="message.author_id" class="o_not_editable"/>
-                    <span class="text-muted">on <span t-field="message.date"/></span>
-                    <div t-field="message.body" class="discussion_scroll_post col-sm-10"/>
-                </div>
-            </li>
-        </ul>
-    </section>
-
     <t t-if="next_post">
         <div class="cover cover_footer mb0 text-center" t-ignore="True">
             <div id="js_blogcover" t-attf-class="cover_footer_bg #{next_post_cover_properties.get('background-color')}" t-attf-style="background-image: #{next_post_cover_properties.get('background-image')};opacity:#{next_post_cover_properties.get('opacity')}"></div>
@@ -291,23 +272,13 @@
 <!-- Options: Blog Post: user can reply -->
 <template id="opt_blog_post_complete_comment" name="Allow blog post comment"
         inherit_id="website_blog.blog_post_complete" active="False" customize_show="True">
-    <xpath expr="//hr" position="attributes">
-        <attribute name="t-if">True</attribute>
-    </xpath>
-    <xpath expr="//ul[@id='comments-list']" position="before">
-        <section class="mb32 read_width css_editable_mode_hidden">
-            <form id="comment" class="js_website_submit_form" t-attf-action="/blog/post_comment/#{blog_post.id}" method="POST">
-                <div class="media">
-                    <span class="pull-left">
-                        <img t-if="user_id.partner_id.image_small" class="img img-circle media-object" t-att-src="website.image_url(user_id.partner_id, 'image_small')" style="width: 30px"/>
-                    </span>
-                    <div class="media-body">
-                        <input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
-                        <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
-                        <button type="submit" class="btn btn-primary mt8">Post</button>
-                    </div>
-                </div>
-            </form>
+    <xpath expr="//div[@id='blog_content']" position="after">
+        <section id="comments" class="read_width">
+            <hr/>
+            <t t-call="website_mail.message_thread">
+              <t t-set="object" t-value="blog_post"/>
+              <t t-set="chatter_mode" t-value="'json'"/>
+            </t>
         </section>
     </xpath>
 </template>