From 318893d6ed941f81bbbea230a087a3574cc97dcb Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Mon, 26 Nov 2018 08:41:39 +0000
Subject: [PATCH 1/2] [IMP] im_livechat, website_livechat : update website
 default livechat

In order to facilitiate the configuration of a livechat on the website,
the first livechat channel that was demo data from im_livechat
is now set as data. Website is now using this first livechat channel
instead of creating a new one and using it.

Task ID : 1912056
Closes PR #29020
---
 addons/im_livechat/__manifest__.py                     | 1 +
 addons/im_livechat/data/im_livechat_channel_data.xml   | 9 +++++++++
 addons/im_livechat/data/im_livechat_channel_demo.xml   | 7 +------
 addons/website_livechat/data/website_livechat_data.xml | 8 +-------
 4 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 addons/im_livechat/data/im_livechat_channel_data.xml

diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index a7ca18b1525..598e45dc37c 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -20,6 +20,7 @@ Help your customers with this chat, and analyse their feedback.
         """,
     'data': [
         "data/mail_shortcode_data.xml",
+        "data/im_livechat_channel_data.xml",
         "security/im_livechat_channel_security.xml",
         "security/ir.model.access.csv",
         "views/rating_views.xml",
diff --git a/addons/im_livechat/data/im_livechat_channel_data.xml b/addons/im_livechat/data/im_livechat_channel_data.xml
new file mode 100644
index 00000000000..59e9e693211
--- /dev/null
+++ b/addons/im_livechat/data/im_livechat_channel_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="im_livechat_channel_data" model="im_livechat.channel">
+            <field name="name">YourWebsite.com</field>
+            <field name="default_message">Hello, how may I help you?</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/data/im_livechat_channel_demo.xml b/addons/im_livechat/data/im_livechat_channel_demo.xml
index 848965ec448..3061dcc799b 100644
--- a/addons/im_livechat/data/im_livechat_channel_demo.xml
+++ b/addons/im_livechat/data/im_livechat_channel_demo.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0"?>
 <odoo>
     <data>
-        <record id="im_livechat_channel_demo" model="im_livechat.channel">
-            <field name="name">YourWebsite.com</field>
-            <field name="default_message">Hello, how may I help you?</field>
-        </record>
-
         <record id="im_livechat_channel_rule_demo" model="im_livechat.channel.rule">
             <field name="regex_url">/im_livechat/</field>
             <field name="action">auto_popup</field>
             <field name="auto_popup_timer">3</field>
-            <field name="channel_id" ref="im_livechat_channel_demo" />
+            <field name="channel_id" ref="im_livechat_channel_data" />
         </record>
 
         <record id="im_livechat.im_livechat_group_user" model="res.groups">
diff --git a/addons/website_livechat/data/website_livechat_data.xml b/addons/website_livechat/data/website_livechat_data.xml
index 42a52461863..0368a3e98af 100644
--- a/addons/website_livechat/data/website_livechat_data.xml
+++ b/addons/website_livechat/data/website_livechat_data.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
      <data noupdate="1">
-
-         <record id="im_livechat_channel_data_website" model="im_livechat.channel">
-             <field name="name">YourWebsiteWithOdoo.com</field>
-             <field name="default_message">Hello, how may I help you?</field>
-         </record>
-
          <record id="website.default_website" model="website">
-             <field name="channel_id" ref="website_livechat.im_livechat_channel_data_website"></field>
+             <field name="channel_id" ref="im_livechat.im_livechat_channel_data"></field>
          </record>
 
          <record id="menu_livechat" model="website.menu">

From a12f693b212c650556fe0114a82717c995af031e Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Thu, 6 Dec 2018 13:01:39 +0000
Subject: [PATCH 2/2] [IMP] im_livechat : set admin as default operator in demo
 data

To avoid having to configure the livechat channel when testing on runbot,
the admin is already set as operator of the livechat channel.

Task ID : 1912056
Closes PR #29020
---
 addons/im_livechat/data/im_livechat_channel_demo.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/im_livechat/data/im_livechat_channel_demo.xml b/addons/im_livechat/data/im_livechat_channel_demo.xml
index 3061dcc799b..26452b27ed4 100644
--- a/addons/im_livechat/data/im_livechat_channel_demo.xml
+++ b/addons/im_livechat/data/im_livechat_channel_demo.xml
@@ -11,5 +11,9 @@
         <record id="im_livechat.im_livechat_group_user" model="res.groups">
             <field name="users" eval="[(4, ref('base.user_demo'))]"/>
         </record>
+
+        <record id="im_livechat_channel_data" model="im_livechat.channel">
+             <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+        </record>
     </data>
 </odoo>