From 70306c63e358ae7d8d9c196597df0144cb626723 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Mon, 24 Sep 2018 17:54:20 +0200
Subject: [PATCH] [FIX] website: create `ir.ui.view`/`website.page` in the same
 record

Somehow, having theses 2 new `website.page` records created separately from
their `ir.ui.view` would throw an error in dev-xml when installing website
module.
A task has been created in website team to track the origin of this bug.

In the meantime, this commit will avoid the traceback by creating the view
inside the page record. As the page's view is not intented to be inherited, it
is the best way to write it anyway.
---
 addons/website/data/website_demo.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index be980571068..6eeab11eb95 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -17,8 +17,10 @@
 
         <!-- BS Debug Page -->
         <!-- Showcase all (most?) BS components and utilities -->
-        <record id="bs_debug_page_view" model="ir.ui.view">
+        <record id="bs_debug_page" model="website.page">
             <field name="name">BS Debug</field>
+            <field name="url">/demo/bs-debug</field>
+            <field name="website_published">False</field>
             <field name="type">qweb</field>
             <field name="key">website.bs_debug_page_view</field>
             <field name="arch" type="xml">
@@ -274,16 +276,13 @@
                 </t>
             </field>
         </record>
-        <record id="bs_debug_page" model="website.page">
-            <field name="url">/demo/bs-debug</field>
-            <field name="website_published">False</field>
-            <field name="view_id" ref="bs_debug_page_view"/>
-        </record>
 
         <!-- Snippet Debug Page -->
         <!-- Showcase all snippets -->
-        <record id="snippets_debug_page_view" model="ir.ui.view">
+        <record id="snippets_debug_page" model="website.page">
             <field name="name">Snippet Debug</field>
+            <field name="url">/demo/snippets-debug</field>
+            <field name="website_published">False</field>
             <field name="type">qweb</field>
             <field name="key">website.snippets_debug_page_view</field>
             <field name="arch" type="xml">
@@ -314,10 +313,5 @@
                 </t>
             </field>
         </record>
-        <record id="snippets_debug_page" model="website.page">
-            <field name="url">/demo/snippets-debug</field>
-            <field name="website_published">False</field>
-            <field name="view_id" ref="snippets_debug_page_view"/>
-        </record>
     </data>
 </odoo>