From 3ec0b4190376b4a5233abb93dfd0ca101746cc76 Mon Sep 17 00:00:00 2001 From: Priyanka Kakadiya Date: Fri, 27 Sep 2019 10:42:34 +0000 Subject: [PATCH] [IMP] website_forum: show share buttons only on validated question MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit: when a user asks a question on a forum, share buttons are always showing even if question is validated or not and hence it will lead to 404 error. After this commit: when a user asks a question on a forum, share buttons will only show after a question is validated. task-2064874 closes odoo/odoo#37505 Signed-off-by: Jérémy Kersten (jke) --- .../website_forum/static/src/js/website_forum.share.js | 9 +++++++-- .../static/src/xml/website_forum_share_templates.xml | 3 ++- addons/website_forum/views/website_forum.xml | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/website_forum/static/src/js/website_forum.share.js b/addons/website_forum/static/src/js/website_forum.share.js index f849fe7ada4..0545d775a81 100644 --- a/addons/website_forum/static/src/js/website_forum.share.js +++ b/addons/website_forum/static/src/js/website_forum.share.js @@ -47,12 +47,17 @@ var ForumShare = publicWidget.registry.socialShare.extend({ * @private */ _render: function () { + var $question = this.$('article.question'); if (!this.targetType) { this._super.apply(this, arguments); } else if (this.targetType === 'social-alert') { - $('.row .question').before(qweb.render('website.social_alert', {medias: this.socialList})); + $question.before(qweb.render('website.social_alert', {medias: this.socialList})); } else { - $('body').append(qweb.render('website.social_modal', {medias: this.socialList, target_type: this.targetType})); + $('body').append(qweb.render('website.social_modal', { + medias: this.socialList, + target_type: this.targetType, + state: $question.data('state'), + })); $('#oe_social_share_modal').modal('show'); } }, diff --git a/addons/website_forum/static/src/xml/website_forum_share_templates.xml b/addons/website_forum/static/src/xml/website_forum_share_templates.xml index 205b05d9011..e1ef8d75194 100644 --- a/addons/website_forum/static/src/xml/website_forum_share_templates.xml +++ b/addons/website_forum/static/src/xml/website_forum_share_templates.xml @@ -13,7 +13,7 @@ -