From 0d3b7d672fce924daabf4f93a340a7dac26fa9f9 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Wed, 5 Aug 2015 15:03:31 +0200
Subject: [PATCH] [IMP] website_sale: use website_mail generic chatter

---
 addons/website_sale/__openerp__.py      |  2 +-
 addons/website_sale/controllers/main.py | 12 -------
 addons/website_sale/views/templates.xml | 45 +++----------------------
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 093d873d7d8..3822ce991a0 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -10,7 +10,7 @@ OpenERP E-Commerce
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['sale', 'website_payment', 'website_portal_sale'],
+    'depends': ['sale', 'website_payment', 'website_mail', 'website_portal_sale'],
     'data': [
         'data/data.xml',
         'data/web_planner_data.xml',
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ed655b5a051..50e49230500 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -299,18 +299,6 @@ class website_sale(http.Controller):
         }
         return request.website.render("website_sale.product", values)
 
-    @http.route(['/shop/product/comment/<int:product_template_id>'], type='http', auth="user", methods=['POST'], website=True)
-    def product_comment(self, product_template_id, **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        if post.get('comment'):
-            request.registry['product.template'].message_post(
-                cr, uid, product_template_id,
-                body=post.get('comment'),
-                message_type='comment',
-                subtype='mt_comment',
-                context=dict(context, mail_create_nosubscribe=True))
-        return werkzeug.utils.redirect('/shop/product/%s#comments' % product_template_id)
-
     @http.route(['/shop/pricelist'], type='http', auth="public", website=True)
     def pricelist(self, promo, **post):
         cr, uid, pool, context = request.cr, request.uid, request.registry, request.context
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index e1d73cc438b..804da7e61bf 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -547,7 +547,6 @@
 </template>
 
 <!-- Product options: OpenChatter -->
-
 <template id="product_comment" inherit_id="website_sale.product" active="False" customize_show="True" name="Discussion">
     <xpath expr="//div[@t-field='product.website_description']" position="after">
         <hr class="mb32"/>
@@ -561,46 +560,10 @@
                         </a>
                     </h3>
                 </div>
-                <ul class="media-list" id="comments-list"  t-if="product.website_message_ids">
-                    <li t-foreach="product.website_message_ids" t-as="message" class="media">
-                        <div class="media-body oe_msg">
-                            <img class="media-object pull-left oe_msg_avatar" t-att-src="website.image_url(message.author_id, 'image_small')" style="width: 50px; margin-right: 10px;"/>
-                            <div class="media-body oe_msg_content">
-                                <t t-call="website.publish_short">
-                                    <t t-set="object" t-value="message"/>
-                                </t>
-                                <h5 class="media-heading">
-                                    <span t-field="message.author_id"/> <small>on <span t-field="message.date"/></small>
-                                </h5>
-                                <div t-field="message.body"/>
-                                <div>
-                                    <div class="oe_msg_attachment" t-foreach='message.attachment_ids' t-as='attachment'>
-                                        <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
-                                            <t t-if="attachment.file_type_icon == 'webimage'">
-                                                <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
-                                                    class='oe_attachment_embedded'></img>
-                                            </t>
-                                            <t t-if="attachment.file_type_icon != 'webimage'">
-                                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
-                                                    class='oe_attachment_webimage'></img>
-                                            </t>
-                                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </li>
-                </ul>
-                <div class="css_editable_mode_hidden">
-                    <form id="comment" class="js_website_submit_form" t-attf-action="/shop/product/comment/#{product.id}" method="POST">
-                        <img class="img pull-left img-rounded" t-att-src="website.image_url(user_id.partner_id, 'image_small')" style="width: 50px; margin-right: 10px;"/>
-                        <div class="pull-left mb32" style="width: 75%%">
-                            <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
-                            <a class="btn btn-primary mt8 a-submit">Post</a>
-                        </div>
-                    </form>
-                </div>
+                <t t-call="website_mail.message_thread">
+                  <t t-set="object" t-value="product"/>
+                  <t t-set="chatter_mode" t-value="'json'"/>
+                </t>
             </div>
         </section>
     </xpath>