diff options
| author | Priyanka Kakadiya <pka@odoo.com> | 2019-09-27 10:42:34 +0000 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2020-02-03 09:07:14 +0000 |
| commit | 3ec0b4190376b4a5233abb93dfd0ca101746cc76 (patch) | |
| tree | 9921e66068143aa65fdac20bae510b299b4688e8 /addons/website_forum/static | |
| parent | 465b79829c9c6cb0f43891ce67190e5c6fc55fc6 (diff) | |
[IMP] website_forum: show share buttons only on validated question
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) <jke@openerp.com>
Diffstat (limited to 'addons/website_forum/static')
| -rw-r--r-- | addons/website_forum/static/src/js/website_forum.share.js | 9 | ||||
| -rw-r--r-- | addons/website_forum/static/src/xml/website_forum_share_templates.xml | 3 |
2 files changed, 9 insertions, 3 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 @@ <t t-if="target_type == 'question'" t-call="website_forum.social_message_question"/> <t t-if="target_type == 'answer'" t-call="website_forum.social_message_answer"/> <t t-if="target_type == 'default'" t-call="website_forum.social_message_default"/> - <div class="share-icons text-center text-primary"> + <div t-if="state != 'pending'" class="share-icons text-center text-primary"> <t t-foreach="medias" t-as="media"> <a style="cursor: pointer" t-attf-class="fa-stack fa-lg share #{media}" t-attf-aria-label="Share on #{media}" t-attf-title="Share on #{media}"> <span class="fa fa-square fa-stack-2x"></span> @@ -45,6 +45,7 @@ <p>On average, <b>45% of questions shared</b> on social networks get an answer within 5 hours. Questions shared on two social networks have <b>65% more chance to get an answer</b> !</p> + <p t-if="state == 'pending'">You can share your question once it has been validated</p> </t> <t t-name="website_forum.social_message_answer"> <p>By sharing you answer, you will get additional <b>karma points</b> if your |