pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_sale: use website_mail generic chatter

Browse Source
This commit is contained in:
Damien Bouvy
2015-08-07 01:47:46 +02:00
committed by Antony Lesuisse
parent 4aa3658adb
commit 0d3b7d672f
3 changed files with 5 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/__openerp__.py
+1 -1
View File
@@ -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',
addons/website_sale/controllers/main.py
-12
View File
@@ -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
addons/website_sale/views/templates.xml
+4 -41
View File
@@ -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>