From a3585b84b5903bfa9c668e91d741ce08297fab3b Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 15 Jul 2016 17:46:59 +0200
Subject: [PATCH] [FIX] website(_*): stop launching old tours on installation

On website/theme installation and other website_* module installation,
an action was triggered to launch tours. These tours are now used only
for tests and should not be used as onboarding anymore.

Note: in master these tours will be removed to use the new test system.
---
 addons/website/data/data.xml                            | 7 +------
 addons/website_blog/data/website_blog_data.xml          | 2 +-
 addons/website_event/data/website_event_data.xml        | 2 +-
 addons/website_sale/data/data.xml                       | 6 +++---
 addons/website_theme_install/models/ir_module_module.py | 2 +-
 addons/website_theme_install/views/views.xml            | 4 ++--
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index 8f6fc1855cf..81894997181 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -76,11 +76,6 @@
             <field name="url">/</field>
             <field name="target">self</field>
         </record>
-        <record id="action_website_tutorial" model="ir.actions.act_url">
-            <field name="name">Website With Tutorial</field>
-            <field name="url">/#tutorial.banner=true</field>
-            <field name="target">self</field>
-        </record>
         <record id="action_website_homepage" model="ir.actions.act_url">
             <field name="name">Website Homepage</field>
             <field name="url">/page/homepage</field>
@@ -95,7 +90,7 @@
         </record>
 
         <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_website_tutorial"/>
+            <field name="action_id" ref="action_website"/>
             <field name="state">open</field>
         </record>
 
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index 457110a8981..e2cbaa2e03e 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -63,7 +63,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Blogs</field>
             <field name="target">self</field>
-            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/#tutorial.blog=true'"/>
+            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_event/data/website_event_data.xml b/addons/website_event/data/website_event_data.xml
index fc91a26667d..d82c160e959 100644
--- a/addons/website_event/data/website_event_data.xml
+++ b/addons/website_event/data/website_event_data.xml
@@ -11,7 +11,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Home</field>
             <field name="target">self</field>
-            <field name="url">/event#tutorial.event=true</field>
+            <field name="url">/event</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 1d631a708ab..709796afebd 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -11,7 +11,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Shop</field>
             <field name="target">self</field>
-            <field name="url">/shop#tutorial.shop=true</field>
+            <field name="url">/shop</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
@@ -47,7 +47,7 @@
         <record id="sale.model_sale_order" model="ir.model">
             <field name="website_form_access" eval="True"/>
             <field name="website_form_label">Sale Order</field>
-        </record> 
+        </record>
         <function model="ir.model.fields" name="formbuilder_whitelist">
             <value>sale.order</value>
             <value eval="[
@@ -62,7 +62,7 @@
         <function model="ir.model.fields" name="formbuilder_whitelist">
             <value>res.partner</value>
             <value eval="[
-                'name', 'phone', 'email', 
+                'name', 'phone', 'email',
                 'city', 'zip', 'street', 'state_id', 'country_id',
                 'vat', 'company_name'
             ]"/>
diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py
index 3a464bacd27..599d14b2bf8 100644
--- a/addons/website_theme_install/models/ir_module_module.py
+++ b/addons/website_theme_install/models/ir_module_module.py
@@ -46,6 +46,6 @@ class IrModuleModule(models.Model):
 
         next_action = self.button_immediate_install() # Then install the new chosen one
         if next_action.get('tag') == 'reload' and not next_action.get('params', {}).get('menu_id'):
-            next_action = self.env.ref('website.action_website_tutorial').read()[0]
+            next_action = self.env.ref('website.action_website').read()[0]
 
         return next_action
diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml
index 1b5ec2e3912..6fdf5427d39 100644
--- a/addons/website_theme_install/views/views.xml
+++ b/addons/website_theme_install/views/views.xml
@@ -18,7 +18,7 @@
                         <div t-if="!has_screenshot" t-attf-style="background-image: url(#{record.icon.value});"/>
                         <div class="o_button_area">
                             <button type="object" name="button_choose_theme" states="uninstalled" class="btn btn-primary btn-sm">Install</button>
-                            <button type="action" name="website.action_website_tutorial" states="installed" class="btn btn-primary btn-sm">Install</button>
+                            <button type="action" name="website.action_website" states="installed" class="btn btn-primary btn-sm">Install</button>
                             <a t-if="record.url.value" class="btn btn-sm btn-primary" t-att-href="record.url.value" target="_blank">Live Preview</a>
                         </div>
                     </div>
@@ -47,7 +47,7 @@
     </record>
 
     <!-- Actions to list themes with custom kanban (launched on module installation) -->
-    <record id="theme_install_kanban_action" model="ir.actions.act_window"> 
+    <record id="theme_install_kanban_action" model="ir.actions.act_window">
         <field name="name">Choose Your Theme</field>
         <field name="res_model">ir.module.module</field>
         <field name="view_mode">kanban</field>