diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-16 19:30:20 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-16 19:30:20 +0100 |
| commit | 6faad524cf5e4db02855cb213277c40aee14c42a (patch) | |
| tree | 383c984dc1461a03481baa9fbdce8c156ca97e2e /addons/website_event | |
| parent | 3657dc77c2ddb4275f07d1271b93e7f25e09913a (diff) | |
| parent | bc744a1da46efda6f1eb5c341f2fa5df30c9c7ad (diff) | |
[MERGE] forward port branch 12.0 up to bc744a1da46
Diffstat (limited to 'addons/website_event')
| -rw-r--r-- | addons/website_event/models/event.py | 4 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 10 | ||||
| -rw-r--r-- | addons/website_event/views/event_views.xml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index c9f9554b149..3b02869cf2e 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -81,7 +81,7 @@ class Event(models.Model): event.menu_id.unlink() elif event.website_menu: if not event.menu_id: - root_menu = self.env['website.menu'].create({'name': event.name, 'website_id': event.id}) + root_menu = self.env['website.menu'].create({'name': event.name, 'website_id': event.website_id.id}) event.menu_id = root_menu for sequence, (name, url, xml_id) in enumerate(event._get_menu_entries()): event._create_menu(sequence, name, url, xml_id) @@ -96,7 +96,7 @@ class Event(models.Model): 'url': url, 'parent_id': self.menu_id.id, 'sequence': sequence, - 'website_id': self.id, + 'website_id': self.website_id.id, }) return menu diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 20608d9e0d7..fc70e2ee4b0 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -74,14 +74,14 @@ </li> </ul> </div> - <div class="row"> - <div class="col-md-6 offset-3"> - <t t-call="website.pager"/> - </div> - </div> <div class="col-lg-3 oe_structure" id="right_column"> </div> </div> + <div class="row"> + <div class="col-md-6 offset-3"> + <t t-call="website.pager"/> + </div> + </div> </div> <div class="oe_structure" id="oe_structure_website_event_index_2"/> </div> diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_views.xml index 7e4df97c36a..566a391772a 100644 --- a/addons/website_event/views/event_views.xml +++ b/addons/website_event/views/event_views.xml @@ -31,7 +31,7 @@ <field name="inherit_id" ref="event.view_event_form"/> <field name="arch" type="xml"> <field name="organizer_id" position="before"> - <field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/> + <field name="website_id" options="{'no_create': True}" attrs="{'required': [('website_menu','=',True)]}" groups="website.group_multi_website"/> </field> <button name="toggle_active" position="before"> <field name="website_url" invisible="1"/> |