summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBhavita Bhatt <bbh@odoo.com>2019-12-16 10:58:00 +0000
committerJeremy Kersten <jke@odoo.com>2020-02-11 15:30:10 +0000
commitc1a1e47b52f13bdd329298e7000b31f551c887a0 (patch)
tree28773d6f468677478f4cdbf00790a440e0325ac7
parent4e340cc5f0c1fe9de17a2b852de4faf65a33926a (diff)
[IMP] website_livechat,website_forum: option hidden after installation
In this commit we deleted tour file of website_forum beacause of the changes applied on forum icon of new click button, live chat icon disappear after livechat module installed and modified livechat channel data for auto-publish channel. task-2088546 closes #40085 Related: odoo/enterprise#6639 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com> Co-authored-by: jpr-odoo <jpr@openerp.com>
-rw-r--r--addons/website_forum/static/src/js/tours/website_forum.js18
-rw-r--r--addons/website_forum/views/website_forum.xml6
-rw-r--r--addons/website_livechat/data/website_livechat_data.xml4
-rw-r--r--addons/website_livechat/views/website_livechat.xml6
4 files changed, 8 insertions, 26 deletions
diff --git a/addons/website_forum/static/src/js/tours/website_forum.js b/addons/website_forum/static/src/js/tours/website_forum.js
index a50c95af286..d3d182701d2 100644
--- a/addons/website_forum/static/src/js/tours/website_forum.js
+++ b/addons/website_forum/static/src/js/tours/website_forum.js
@@ -7,22 +7,8 @@ odoo.define("website_forum.tour_forum", function (require) {
var _t = core._t;
tour.register("question", {
- url: "/",
- }, [tour.STEPS.WEBSITE_NEW_PAGE, {
- trigger: "a[data-action=new_forum]",
- extra_trigger: "body.o_new_content_open",
- content: _t("Select this menu item to create a new forum."),
- position: "bottom",
- }, {
- trigger: "#editor_new_forum input[type=text]",
- content: _t("Enter a name for your new forum."),
- position: "right",
- }, {
- trigger: "button.btn-primary",
- extra_trigger: '.modal #editor_new_forum input[type=text]:not(:propValue(""))',
- content: _t("Click <em>Continue</em> to create the forum."),
- position: "right",
- }, {
+ url: "/forum/1",
+ }, [{
trigger: ".o_forum_ask_btn",
position: "left",
content: _t("Ask the question in this forum by clicking on the button."),
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index d2a77de4971..b9ca3312112 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1603,11 +1603,7 @@
<!-- User Navbar -->
<template id="user_navbar_inherit_website_forum" inherit_id="website.user_navbar">
- <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_forum']" position="attributes">
- <attribute name="name"/>
- <attribute name="t-att-data-module-id"/>
- <attribute name="t-att-data-module-shortdesc"/>
- <attribute name="groups">website.group_website_designer</attribute>
+ <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_forum']" position="replace">
</xpath>
</template>
diff --git a/addons/website_livechat/data/website_livechat_data.xml b/addons/website_livechat/data/website_livechat_data.xml
index 0368a3e98af..554ff7694dd 100644
--- a/addons/website_livechat/data/website_livechat_data.xml
+++ b/addons/website_livechat/data/website_livechat_data.xml
@@ -11,5 +11,9 @@
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence">55</field>
</record>
+
+ <record id="im_livechat.im_livechat_channel_data" model="im_livechat.channel">
+ <field name="is_published" eval="True"/>
+ </record>
</data>
</odoo>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index a6f0796d01c..20c5c08c861 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -230,11 +230,7 @@
<!-- User Navbar -->
<template id="user_navbar_inherit_website_livechat" inherit_id="website.user_navbar">
- <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_livechat']" position="attributes">
- <attribute name="name"/>
- <attribute name="t-att-data-module-id"/>
- <attribute name="t-att-data-module-shortdesc"/>
- <attribute name="groups">im_livechat.im_livechat_group_manager</attribute>
+ <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_livechat']" position="replace">
</xpath>
</template>