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

[REF] *: clean settings views inheritance

Browse Source 
* make sure xpath expression content is specified in parent view.

Part-of: odoo/odoo#91909
This commit is contained in:
Victor Feyens
2022-06-23 23:48:29 +02:00
parent fba6ea5a47
commit 76d5879c1e
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_totp_mail_enforce/views/res_config_settings_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="name">res.config.settings.view.form.inherit.auth_totp_mail_enforce</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="40"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='allow_import']" position="before">
<div class="col-12 col-lg-6 o_setting_box" id="auth_totp_policy">
addons/portal/views/res_config_settings_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="name">res.config.settings.view.form.inherit.portal</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="40"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name=%(base.action_apikeys_admin)d]//ancestor::div[hasclass('o_setting_box')]" position="inside">
<div groups="base.group_no_one">
addons/website_event_track/views/res_config_settings_view.xml
+3 -2
View File
@@ -4,9 +4,10 @@
<field name="name">res.config.settings.view.form.inherit.website</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="20"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="inherit_id" ref="website.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]//div[@id='website_settings']" position="inside">
<!-- TODO TDE there are two div with website_settings id in the website settings view -->
<xpath expr="//div[@id='website_settings']" position="inside">
<div class="col-12 col-lg-6 o_setting_box" id="events_app_setting" groups="base.group_no_one">
<div class="o_setting_right_pane">
<label for="events_app_name" string="Events PWA"/>
addons/website_payment/views/res_config_settings_views.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">res.config.settings.view.form.inherit.website</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="20"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="inherit_id" ref="website.res_config_settings_view_form"/>
<field name="arch" type="xml">
<div id="website_info_settings" position="after">
<h2>Shop - Payment</h2>
addons/website_payment_authorize/views/res_config_settings_views.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">res.config.settings.view.form.inherit.payment.authorize</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="20"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="inherit_id" ref="website_payment.res_config_settings_view_form"/>
<field name="arch" type="xml">
<div id="paypal_settings" position="before">
<div class="col-12 col-lg-6 o_setting_box">