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

[REF] event_*: tweak some views to help sub modules inheritance

Browse Source 
RATIONALE

Even will soon gain a major update called Event Online, allowing to better
support full-online events. In order to prepare its merge, preparatory merge
are done to lessen the final diff.

PURPOSE

Prepare Event Online support by providing fixes in registration and event
frontend flows. Also provide a quick back2basic in backend views to prepare
addition of Online sub modules.

SPECIFICATIONS

Extract menus entries in separate menus.xml file to ease understanding.
Minimal move is done to avoid too large diff. Complete guidelines compliance
will be done in master.

Sequence configuration menu entries to ease their ordering. Indeed when having
all event sub-apps installed configuration is messy, with event menus mixed
with track menus, ...

Improve event tag view (remove title, have a simple form view)

Improve event sponsor views (add group-by, improve form view, add no content
helpers). Those will become exhibitors and having usable views is necessary.

Add some anchors in existing views to ease inheritance.

LINKS

Community PR odoo/odoo#55197
Enterprise PR odoo/enterprise#12113

Task ID-2309702 (Event Preparatory Merge 4)
Prepares Task ID-2252655 (Main Online Event task)
Prepares Task ID-2283796 (Event B2Basics / Registration Flow)
Prepares Task ID-2299857 (Event Design Review)

Co-Authored-By: Aurélien Warnon <awa@odoo.com>
Co-Authored-By: David Beguin <dbe@odoo.com>
Co-Authored-By: Thibault Delavallée <tde@odoo.com>
This commit is contained in:
Thibault Delavallée
2020-07-31 15:35:46 +00:00
co-authored by Aurélien Warnon David Beguin
parent 567bd4d9d9
commit e8dd796b7a
15 changed files with 139 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/views/event_menu_views.xml
+4
View File
@@ -32,6 +32,10 @@
id="menu_event_type"
sequence="1"
parent="menu_event_configuration"/>
<menuitem name="Event Stages"
id="event_stage_menu"
sequence="2"
parent="menu_event_configuration"/>
<menuitem name="Mail Schedulers"
id="menu_event_mail_schedulers"
sequence="10"
addons/event/views/event_stage_views.xml
+4 -1
View File
@@ -56,6 +56,9 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="event_stage_menu" name="Event Stages" action="event_stage_action" parent="menu_event_configuration"/>
<record id="event_stage_menu" model="ir.ui.menu">
<field name="action" ref="event.event_stage_action"/>
</record>
</data>
</odoo>
addons/event/views/event_tag_views.xml
+2 -5
View File
@@ -61,12 +61,9 @@
<field name="arch" type="xml">
<form string="Event Category Tag">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
<group>
<field name="category_id" widget="many2one" class="oe_inline"/>
<field name="name"/>
<field name="category_id" widget="many2one"/>
</group>
</sheet>
</form>
addons/event/views/event_views.xml
+7 -2
View File
@@ -72,10 +72,15 @@
</div>
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box" name="event_type_visibility_tags">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<label for="tag_ids" string="Tags"/>
<field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
<div class="row">
<div class="col-12 mt16">
<field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
</div>
</div>
</div>
</div>
</div>
addons/website_event/views/event_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</div>
<div class="o_setting_right_pane">
<label for="website_menu"/>
<div class="row">
<div class="row" name="website_menu">
<div class="col-lg-8 mt16 text-muted">
Check this option to have menus for your event on the
website: registrations, schedule, map, ...
addons/website_event_track/__manifest__.py
+1
View File
@@ -18,6 +18,7 @@
'views/event_sponsor_views.xml',
'views/event_views.xml',
'views/website_event_menu_views.xml',
'views/event_menus.xml',
],
'demo': [
'data/res_partner_demo.xml',
addons/website_event_track/i18n/website_event_track.pot
+33 -10
View File
@@ -127,11 +127,6 @@ msgstr ""
msgid "About The Speaker"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage__is_done
msgid "Accepted Stage"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__message_needaction
#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_needaction
@@ -283,6 +278,11 @@ msgstr ""
msgid "Confirmed"
msgstr ""
#. module: website_event_track
#: model_terms:ir.actions.act_window,help:website_event_track.event_sponsor_action_from_event
msgid "Create a Sponsor"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__create_uid
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type__create_uid
@@ -346,6 +346,11 @@ msgstr ""
msgid "Documents"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage__is_done
msgid "Done Stage"
msgstr ""
#. module: website_event_track
#: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
msgid "Dropdown menu"
@@ -377,6 +382,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__event_id
#: model:ir.model.fields,field_description:website_event_track.field_event_track__event_id
#: model:ir.model.fields,field_description:website_event_track.field_website_event_menu__event_id
#: model_terms:ir.ui.view,arch_db:website_event_track.event_sponsor_view_search
#: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Event"
msgstr ""
@@ -517,6 +523,7 @@ msgid "Grey"
msgstr ""
#. module: website_event_track
#: model_terms:ir.ui.view,arch_db:website_event_track.event_sponsor_view_search
#: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Group By"
msgstr ""
@@ -653,11 +660,6 @@ msgstr ""
msgid "Location"
msgstr ""
#. module: website_event_track
#: model:ir.ui.menu,name:website_event_track.menu_event_track_location
msgid "Locations"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__image_128
msgid "Logo"
@@ -689,6 +691,11 @@ msgstr ""
msgid "Menu Type"
msgstr ""
#. module: website_event_track
#: model:ir.actions.act_window,name:website_event_track.website_event_menu_action
msgid "Menus"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__message_has_error
#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_has_error
@@ -992,6 +999,11 @@ msgstr ""
msgid "Sponsors"
msgstr ""
#. module: website_event_track
#: model_terms:ir.ui.view,arch_db:website_event_track.event_sponsor_view_search
msgid "Sponsorship"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__stage_id
#: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_search
@@ -1130,6 +1142,11 @@ msgstr ""
msgid "Track End Date"
msgstr ""
#. module: website_event_track
#: model:ir.ui.menu,name:website_event_track.menu_event_track_location
msgid "Track Locations"
msgstr ""
#. module: website_event_track
#: model:mail.message.subtype,name:website_event_track.mt_track_ready
msgid "Track Ready"
@@ -1250,6 +1267,12 @@ msgstr ""
msgid "We will evaluate your proposition and get back to you shortly."
msgstr ""
#. module: website_event_track
#: model_terms:ir.ui.view,arch_db:website_event_track.event_sponsor_view_form
#: model_terms:ir.ui.view,arch_db:website_event_track.event_sponsor_view_tree
msgid "Website"
msgstr ""
#. module: website_event_track
#: model:ir.model,name:website_event_track.model_website_event_menu
msgid "Website Event Menu"
addons/website_event_track/models/event_track_stage.py
+1 -1
View File
@@ -18,6 +18,6 @@ class TrackStage(models.Model):
fold = fields.Boolean(
string='Folded in Kanban',
help='This stage is folded in the kanban view when there are no records in that stage to display.')
is_done = fields.Boolean(string='Accepted Stage')
is_done = fields.Boolean(string='Done Stage')
is_cancel = fields.Boolean(string='Canceled Stage')
color = fields.Integer(string='Color')
addons/website_event_track/static/src/xml/customize_options.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-extend="website_event.customize_options">
<t t-name="website_event_track.customize_options" t-extend="website_event.customize_options">
<t t-jquery="a[name='display-website-menu']" t-operation="after">
<a href="#" name="display-showcase-talks" class="dropdown-item" role="menuitem">
<label class="o_switch" for="display-showcase-talks">
addons/website_event_track/views/event_menus.xml
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0"?>
<odoo><data>
<!-- MAIN ITEMS -->
<menuitem id="menu_event_track"
name="Tracks"
sequence="40"
action="action_event_track"
parent="event.event_main_menu"
groups="base.group_no_one"/>
<!-- CONFIGURATION -->
<menuitem id="event_track_stage_menu"
name="Track Stages"
action="event_track_stage_action"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="30"/>
<menuitem id="menu_event_track_location"
name="Track Locations"
action="action_event_track_location"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="32"/>
<menuitem
id="menu_event_track_tag"
name="Track Tags"
action="action_event_track_tag"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="34"/>
<menuitem id="menu_event_sponsor_type"
name="Sponsor Types"
action="event_sponsor_type_action"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="40"/>
<menuitem id="menu_website_event_menu"
name="Website Menus"
action="website_event_menu_action"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="99"/>
</data></odoo>
addons/website_event_track/views/event_sponsor_views.xml
+11 -5
View File
@@ -33,8 +33,6 @@
<field name="res_model">event.sponsor.type</field>
</record>
<menuitem action="event_sponsor_type_action" groups="base.group_no_one" id="menu_event_sponsor_type" parent="event.menu_event_configuration"/>
<record id="event_sponsor_view_search" model="ir.ui.view">
<field name="name">event.sponsor.search</field>
<field name="model">event.sponsor</field>
@@ -43,6 +41,10 @@
<field name="partner_id"/>
<field name="event_id"/>
<filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
<group string="Group By" expand="0">
<filter string="Event" name="group_by_event_id" domain="[]" context="{'group_by': 'event_id'}"/>
<filter string="Sponsorship" name="group_by_sponsor_type_id" domain="[]" context="{'group_by': 'sponsor_type_id'}"/>
</group>
</search>
</field>
</record>
@@ -61,8 +63,7 @@
<group>
<field name="event_id"/>
<field name="partner_email" widget="email"/>
<field name="url" widget="url"/>
<field name="sequence" groups="base.group_no_one"/>
<field name="url" widget="url" string="Website"/>
</group>
<group>
<field name="sponsor_type_id"/>
@@ -87,7 +88,7 @@
<tree>
<field name="sequence" widget="handle"/>
<field name="partner_id"/>
<field name="url"/>
<field name="url" string="Website"/>
<field name="sponsor_type_id"/>
</tree>
</field>
@@ -126,6 +127,11 @@
<field name="res_model">event.sponsor</field>
<field name="view_mode">kanban,tree,form</field>
<field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Create a Sponsor
</p>
</field>
</record>
</data>
</odoo>
addons/website_event_track/views/event_track_templates.xml
+1 -1
View File
@@ -75,7 +75,7 @@
<t t-set="track" t-value="dt[1][location][0]"/>
<t t-if="track">
<td t-att-rowspan="dt[1][location][3]" t-attf-class="event_color_#{track.color} #{track and 'event_track' or ''}">
<t t-if="track">
<t t-if="track" name="track_agenda_track_cell">
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
<span t-esc="track and track.name"/>
<span t-if="not track.website_published" class="badge badge-warning">unpublished</span>
addons/website_event_track/views/event_track_views.xml
-26
View File
@@ -222,14 +222,6 @@
</field>
</record>
<menuitem
id="menu_event_track"
name="Tracks"
sequence="40"
action="action_event_track"
parent="event.event_main_menu"
groups="base.group_no_one"/>
<!-- EVENTS/CONFIGURATION/EVENT locations -->
<record model="ir.ui.view" id="view_event_location_form">
<field name="name">Event Locations</field>
@@ -260,12 +252,6 @@
<field name="res_model">event.track.location</field>
</record>
<menuitem
id="menu_event_track_location"
name="Locations"
action="action_event_track_location"
parent="event.menu_event_configuration"/>
<!-- EVENTS/CONFIGURATION/EVENT Tags -->
<record model="ir.ui.view" id="view_event_track_tag_form">
<field name="name">Track Tags</field>
@@ -296,12 +282,6 @@
<field name="res_model">event.track.tag</field>
</record>
<menuitem
id="menu_event_track_tag"
action="action_event_track_tag"
parent="event.menu_event_configuration"
groups="base.group_no_one"/>
<!-- EVENTS TRACK STAGES-->
<record id="event_track_stage_view_search" model="ir.ui.view">
<field name="name">event.track.stage.view.search</field>
@@ -386,10 +366,4 @@
</field>
</record>
<menuitem name="Track Stages"
id="event_track_stage_menu"
action="event_track_stage_action"
parent="event.menu_event_configuration"
groups="base.group_no_one"/>
</odoo>
addons/website_event_track/views/event_views.xml
+24 -25
View File
@@ -6,7 +6,7 @@
<field name="model">event.type</field>
<field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='event_type_visibility_website']/div[hasclass('o_setting_right_pane')]" position='inside'>
<xpath expr="//div[@name='website_menu']" position='after'>
<div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
<label class="col-lg-4" for="website_track"/> <field name="website_track"/>
</div>
@@ -17,30 +17,29 @@
</field>
</record>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<record id="view_event_form" model="ir.ui.view">
<field name="name">Event Tracks</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="model">event.event</field>
<field name="priority" eval="3"/>
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button name="%(action_event_track_from_event)d"
type="action"
class="oe_stat_button"
icon="fa-microphone"
context="{'default_date': date_begin}">
<field name="track_count" string="Tracks" widget="statinfo"/>
</button>
<button name="%(event_sponsor_action_from_event)d"
type="action"
class="oe_stat_button"
icon="fa-black-tie">
<field name="sponsor_count" string="Sponsors" widget="statinfo"/>
</button>
</div>
</field>
</record>
<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"/>
<field name="model">event.event</field>
<field name="priority" eval="3"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='is_published']" position="before">
<button name="%(action_event_track_from_event)d"
type="action"
class="oe_stat_button"
icon="fa-microphone"
context="{'default_date': date_begin}">
<field name="track_count" string="Tracks" widget="statinfo"/>
</button>
<button name="%(event_sponsor_action_from_event)d"
type="action"
class="oe_stat_button"
icon="fa-black-tie">
<field name="sponsor_count" string="Sponsors" widget="statinfo"/>
</button>
</xpath>
</field>
</record>
<record id="event_event_view_list_inherit_website_event_track" model="ir.ui.view">
<field name="name">event.event.view.list.inherit.website.event.track</field>
addons/website_event_track/views/website_event_menu_views.xml
-7
View File
@@ -47,12 +47,5 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_website_event_menu"
name="Website Menus"
action="website_event_menu_action"
parent="event.menu_event_configuration"
groups="base.group_no_one"
sequence="99"/>
</data>
</odoo>