From ea022f0d4abc59adc7d6f256f6d85c85249a0985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Mon, 4 May 2015 15:02:41 +0200 Subject: [PATCH] [FIX] website_blog, website_sale, website_quote, website_slide : fix adding comment after mail migration The commit 4b122ad41d873febe288ab1f8c6cdc078ca2a479 rename the 'type' field of mail.message into 'message_type'. The change was not applied to the adding comment feature of website module. The comments were posted but not displayed. --- addons/website_blog/controllers/main.py | 2 +- addons/website_forum/controllers/main.py | 2 +- addons/website_quote/controllers/main.py | 12 ++++++------ addons/website_sale/controllers/main.py | 2 +- addons/website_slides/controllers/main.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index d13f96c4ed3..5aa132d48c8 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -264,7 +264,7 @@ class WebsiteBlog(http.Controller): message_id = BlogPost.message_post( cr, uid, int(blog_post_id), body=message_content, - type='comment', + message_type='comment', subtype='mt_comment', author_id=partner_id, path=post.get('path', False), diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index 7efba912ef0..3d269740e79 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -338,7 +338,7 @@ class WebsiteForum(http.Controller): # TDE FIXME: check that post_id is the question or one of its answers post.with_context(mail_create_nosubscribe=True).message_post( body=kwargs.get('comment'), - type='comment', + message_type='comment', subtype='mt_comment') return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py index 0c295d20b92..ce31ae6f974 100644 --- a/addons/website_quote/controllers/main.py +++ b/addons/website_quote/controllers/main.py @@ -46,7 +46,7 @@ class sale_quote(http.Controller): if request.session.get('view_quote',False)!=now: request.session['view_quote'] = now body=_('Quotation viewed by customer') - self.__message_post(body, order_id, type='comment') + self.__message_post(body, order_id, message_type='comment') days = 0 if order.validity_date: days = (datetime.datetime.strptime(order.validity_date, '%Y-%m-%d') - datetime.datetime.now()).days + 1 @@ -74,7 +74,7 @@ class sale_quote(http.Controller): attachments=sign and [('signature.png', sign.decode('base64'))] or [] order_obj.signal_workflow(request.cr, SUPERUSER_ID, [order_id], 'order_confirm', context=request.context) message = _('Order signed by %s') % (signer,) - self.__message_post(message, order_id, type='comment', subtype='mt_comment', attachments=attachments) + self.__message_post(message, order_id, message_type='comment', subtype='mt_comment', attachments=attachments) return True @http.route(['/quote///decline'], type='http', auth="public", website=True) @@ -86,7 +86,7 @@ class sale_quote(http.Controller): request.registry.get('sale.order').action_cancel(request.cr, SUPERUSER_ID, [order_id]) message = post.get('decline_message') if message: - self.__message_post(message, order_id, type='comment', subtype='mt_comment') + self.__message_post(message, order_id, message_type='comment', subtype='mt_comment') return werkzeug.utils.redirect("/quote/%s/%s?message=2" % (order_id, token)) @http.route(['/quote///post'], type='http', auth="public", website=True) @@ -98,17 +98,17 @@ class sale_quote(http.Controller): if token != order.access_token: return request.website.render('website.404') if message: - self.__message_post(message, order_id, type='comment', subtype='mt_comment') + self.__message_post(message, order_id, message_type='comment', subtype='mt_comment') return werkzeug.utils.redirect("/quote/%s/%s?message=1" % (order_id, token)) - def __message_post(self, message, order_id, type='comment', subtype=False, attachments=[]): + def __message_post(self, message, order_id, message_type='comment', subtype=False, attachments=[]): request.session.body = message cr, uid, context = request.cr, request.uid, request.context user = request.registry['res.users'].browse(cr, SUPERUSER_ID, uid, context=context) if 'body' in request.session and request.session.body: request.registry.get('sale.order').message_post(cr, SUPERUSER_ID, order_id, body=request.session.body, - type=type, + message_type=message_type, subtype=subtype, author_id=user.partner_id.id, context=context, diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 93829a315f1..5c2df31028e 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -298,7 +298,7 @@ class website_sale(http.Controller): request.registry['product.template'].message_post( cr, uid, product_template_id, body=post.get('comment'), - type='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) diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index b403a113c8f..0076ac17671 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -207,7 +207,7 @@ class website_slides(http.Controller): contextual_slide.message_post( body=post['comment'], - type='comment', + message_type='comment', subtype='mt_comment', **post_kwargs )