summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2020-08-19 12:48:21 +0000
committerThibault Delavallée <tde@odoo.com>2020-08-21 17:30:13 +0000
commit8da7288453d43ff6ccfd6cb6d8332eec998d3927 (patch)
treefc556cccb1d2dd4236dc48a17a49cb8259fa71fb
parent0fc9e8c6760c525295b261c13be462ae0b1f0349 (diff)
[REF] website_event_*: fix some views xml ids
PURPOSE Clean organization and models linked to Event Online feature introduced in semi stable saas-13.3 at odoo/odoo@981f95bbf46658eda9f2d33751b9310cc67d86aa and odoo/enterprise@14722028ae0773c3710ea48ce48ff44703e83b5a Also clean website event menu not being available in website event but only in website event track, which implies some extra-code to manage it. In short: merge website_event_online in website_event, website_event_track _(online/session) in website_event_track. RATIONALE _online modules have been added to extend content of website_event and website_event_track without having any impact on those module. First step of cleaning is to move this content directly in base module. track_session module is mainly a rewrite of track module. Second step of cleaning is to move its content directly in website_event_track. SPECIFICATIONS Rename some Xml IDs to ease future maintenance of views, as event application has a lot of sub modules adding their own fields inside base view of event models. LINKS Task ID-2319779 COM odoo/odoo#56067 ENT odoo/enterprise#12520 UPG odoo/upgrade#165#
-rw-r--r--addons/website_event/views/event_event_views.xml4
-rw-r--r--addons/website_event/views/event_type_views.xml2
-rw-r--r--addons/website_event_meet/views/event_type_views.xml2
-rw-r--r--addons/website_event_questions/views/event_views.xml6
-rw-r--r--addons/website_event_track/views/event_event_views.xml8
-rw-r--r--addons/website_event_track/views/event_type_views.xml2
-rw-r--r--addons/website_event_track_exhibitor/views/event_type_views.xml2
-rw-r--r--addons/website_event_track_online/views/event_type_views.xml2
-rw-r--r--addons/website_event_track_quiz/views/event_type_views.xml2
9 files changed, 15 insertions, 15 deletions
diff --git a/addons/website_event/views/event_event_views.xml b/addons/website_event/views/event_event_views.xml
index a8028029219..40b949e23bc 100644
--- a/addons/website_event/views/event_event_views.xml
+++ b/addons/website_event/views/event_event_views.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="event_event_view_form_inherit_website" model="ir.ui.view">
+ <record id="event_event_view_form" model="ir.ui.view">
<field name="name">event.event.view.form.inherit.website</field>
<field name="model">event.event</field>
<field name="priority" eval="5"/>
@@ -22,7 +22,7 @@
</field>
</record>
- <record id="event_event_view_list_inherit_website" model="ir.ui.view">
+ <record id="event_event_view_list" model="ir.ui.view">
<field name="name">event.event.view.list.inherit.website</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_tree"/>
diff --git a/addons/website_event/views/event_type_views.xml b/addons/website_event/views/event_type_views.xml
index f37e9055966..8ace9ddc2d7 100644
--- a/addons/website_event/views/event_type_views.xml
+++ b/addons/website_event/views/event_type_views.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="event_type_view_form_inherit_website" model="ir.ui.view">
+ <record id="event_type_view_form" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.website</field>
<field name="model">event.type</field>
<field name="inherit_id" ref="event.view_event_type_form"/>
diff --git a/addons/website_event_meet/views/event_type_views.xml b/addons/website_event_meet/views/event_type_views.xml
index 8e76e97f4d6..616206d9418 100644
--- a/addons/website_event_meet/views/event_type_views.xml
+++ b/addons/website_event_meet/views/event_type_views.xml
@@ -3,7 +3,7 @@
<record id="event_type_view_form" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.meet</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='website_menu']" position='after'>
<div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_questions/views/event_views.xml b/addons/website_event_questions/views/event_views.xml
index d42565f51b2..7b92e292d94 100644
--- a/addons/website_event_questions/views/event_views.xml
+++ b/addons/website_event_questions/views/event_views.xml
@@ -3,7 +3,7 @@
<record id="event_type_view_form_inherit_question" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.question</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<div name="event_type_attendees_auto_confirm" position="after">
<div class="col-12 col-lg-12 o_setting_box">
@@ -28,10 +28,10 @@
</field>
</record>
- <record id="event_event_view_form_inherit_question" model="ir.ui.view">
+ <record id="event_event_view_form" model="ir.ui.view">
<field name="name">event.event.view.form.inherit.question</field>
<field name="model">event.event</field>
- <field name="inherit_id" ref="website_event.event_event_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_event_view_form"/>
<field name="arch" type="xml">
<data>
<page name="event_notes" position="before">
diff --git a/addons/website_event_track/views/event_event_views.xml b/addons/website_event_track/views/event_event_views.xml
index 5860359a278..236f47a910b 100644
--- a/addons/website_event_track/views/event_event_views.xml
+++ b/addons/website_event_track/views/event_event_views.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="view_event_form" model="ir.ui.view">
- <field name="name">Event Tracks</field>
- <field name="inherit_id" ref="website_event.event_event_view_form_inherit_website"/>
+ <record id="event_event_view_form" model="ir.ui.view">
+ <field name="name">event.event.view.from.inherit.track</field>
+ <field name="inherit_id" ref="website_event.event_event_view_form"/>
<field name="model">event.event</field>
<field name="priority" eval="3"/>
<field name="arch" type="xml">
@@ -25,7 +25,7 @@
</field>
</record>
- <record id="event_event_view_list_inherit_website_event_track" model="ir.ui.view">
+ <record id="event_event_view_list" model="ir.ui.view">
<field name="name">event.event.view.list.inherit.website.event.track</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_tree"/>
diff --git a/addons/website_event_track/views/event_type_views.xml b/addons/website_event_track/views/event_type_views.xml
index 71fd10153ea..1c49a0438d3 100644
--- a/addons/website_event_track/views/event_type_views.xml
+++ b/addons/website_event_track/views/event_type_views.xml
@@ -4,7 +4,7 @@
<record id="event_type_view_form_inherit_track" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.track</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='website_menu']" position='after'>
<div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_track_exhibitor/views/event_type_views.xml b/addons/website_event_track_exhibitor/views/event_type_views.xml
index ab2ffe85c81..517285d2dc6 100644
--- a/addons/website_event_track_exhibitor/views/event_type_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_type_views.xml
@@ -3,7 +3,7 @@
<record id="event_type_view_form" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.exhibitor</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='website_menu']" position='after'>
<div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_track_online/views/event_type_views.xml b/addons/website_event_track_online/views/event_type_views.xml
index f3b28139ee7..9ecd3283fd8 100644
--- a/addons/website_event_track_online/views/event_type_views.xml
+++ b/addons/website_event_track_online/views/event_type_views.xml
@@ -3,7 +3,7 @@
<record id="event_type_view_form" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.meet</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='website_menu']" position='after'>
<div id="community-menu" class="row mt16" groups="base.group_no_one" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_track_quiz/views/event_type_views.xml b/addons/website_event_track_quiz/views/event_type_views.xml
index 2fe00f48acf..5f5e01a0d58 100644
--- a/addons/website_event_track_quiz/views/event_type_views.xml
+++ b/addons/website_event_track_quiz/views/event_type_views.xml
@@ -3,7 +3,7 @@
<record id="event_type_view_form" model="ir.ui.view">
<field name="name">event.type.view.form.inherit.meet</field>
<field name="model">event.type</field>
- <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+ <field name="inherit_id" ref="website_event.event_type_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='community-menu']" position="attributes">
<attribute name="groups"></attribute>