pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_*: convert old ir.ui.view page=True into website.page in 1 record

Browse Source 
Before this commit, website.page xml record were created in 2 steps:
	1. Create an ir.ui.view record with <template> tag
	2. Create a website.page record with <record model="website.page">
But this is useless since website.page inheritS ir.ui.view, you can create both
records just in one <record> tag.

Note: This is NOT TRUE in every case:
Odoo's ORM will suffix external_id of inherited records (in this case the
ir.ui.view created through the website.page record) with its model's name.
This can be a problem in some case (this is an example):
	website_crm_template.xml create an ir.ui.view inheriting the
	ir.ui.view 'website.contactus'.
	But if we didn't keep website.page & ir.ui.view records split for that
	specific case, the ir.ui.view would inherit a website.page record
	causing an error. (website.contactus would be the id of the page record
	while the ir.ui.view's id would be website.contactus_ir_ui_view)

In short: when migrating an ir.ui.view (<record> xml) to a website.page:
	* If there is record inheriting the ir.ui.view ID, then split
	  website.page & ir.ui.view
	* if not, you can create the website.page and its ir.ui.view both in one
	  record (<record model="website.page").

This commit also removed remaining page="True" from xml template since we
removed the 'page' attribute from ir.ui.view model overrided in website module.
This commit is contained in:
rde
2017-09-26 16:08:14 +02:00
parent 0426849de1
commit 8baabfb6be
5 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_import_module/tests/test_module/test.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<field name="currency_id" ref="base.EUR"/>
</record>
<template id="test_page" name="Test Page" page="True">
<template id="test_page" name="Test Page">
<t t-call="website.layout">
<h1>
This page comes from an imported module!
addons/website/data/website_data.xml
+1 -10
View File
@@ -30,16 +30,7 @@
<field name="website_id" ref="default_website"/>
</record>
<!--
Keep homepage & contactus page split between ir_ui_view & website_page record
So external_id of the ir_ui_view record is still 'website.contactus' and not 'website.contactus_ir_ui_view' (same for homepage)
Indeed Odoo put a suffix on external_id on submodels records (inherits) with the model's name as suffix.
eg: record website_page is 'website.contactus' & ir_ui_view record is 'website.contactus_ir_ui_view'
but since website_crm_template.xml (and surely others) inherit the contactus ir_ui_view record (inherit_id="website.contactus"),
the external_id of the contactus ir_ui_view record still has to be 'website.contactus'.
(Put in another way, external_id 'website.contactus' can't be the external_id of the website_page record or the inherit will ofc fail)
(Or change inherit_id in related files but possibly alot. Safer this way)
-->
<!-- split between ir_ui_view & website_page record to keep external_id on ir_ui_view -->
<record id="homepage" model="ir.ui.view">
<field name="name">Home</field>
<field name="type">qweb</field>
addons/website_crm/views/website_crm_templates.xml
+3 -6
View File
@@ -50,9 +50,11 @@
</div>
</xpath>
</template>
<record id="contactus_thanks" model="ir.ui.view">
<record id="contactus_thanks" model="website.page">
<field name="name">Thanks (Contact us)</field>
<field name="type">qweb</field>
<field name="url">/contactus-thank-you</field>
<field name="website_published">True</field>
<field name="key">website_crm.contactus_thanks</field>
<field name="arch" type="xml">
<t name="Thanks (Contact us)" t-name="website_crm.contactus_thanks">
@@ -88,11 +90,6 @@
</t>
</field>
</record>
<record id="contactus_thanks_page" model="website.page">
<field name="url">/contactus-thank-you</field>
<field name="website_published">True</field>
<field name="ir_ui_view_id" ref="contactus_thanks" />
</record>
<template id="website_crm_tests" name="Website CRM Tests" inherit_id="web.assets_common">
<xpath expr="." position="inside">
addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+3 -6
View File
@@ -385,7 +385,9 @@
</section>
</template>
<record id="thankyou" model="ir.ui.view">
<record id="thankyou" model="website.page">
<field name="url">/job-thank-you</field>
<field name="website_published">True</field>
<field name="name">Thank you (Recruitment)</field>
<field name="type">qweb</field>
<field name="key">website_hr_recruitment.thankyou</field>
@@ -445,11 +447,6 @@
</t>
</field>
</record>
<record id="thankyou_page" model="website.page">
<field name="url">/job-thank-you</field>
<field name="website_published">True</field>
<field name="ir_ui_view_id" ref="thankyou" />
</record>
<template id="job_countries" inherit_id="website_hr_recruitment.index" active="False" customize_show="True" name="Filter by Countries">
<xpath expr="//div[@id='jobs_grid_left']" position="inside">
addons/website_livechat/views/website_livechat.xml
+1 -1
View File
@@ -38,7 +38,7 @@
</template>
<!-- Page Layout -->
<template id="channel_page" name="Livechat Channel Satisfaction Page" page="True">
<template id="channel_page" name="Livechat Channel Satisfaction Page">
<t t-call="website.layout">
<div id="wrap">
<div class="container">