From 99adf83e389fbbd4834952750e223cd261dbc82e Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Mon, 26 Sep 2022 18:01:31 +0000 Subject: [PATCH] [IMP] web: expose sub template of calendar components Make it easier to override component's sub templates by making them overridable on the component. TaskId-2999194 X-original-commit: 4f4e91ebb14d563dd3ec6d305b9984db25e06cbf Part-of: odoo/odoo#101492 --- .../calendar_common/calendar_common_popover.js | 5 +++++ .../calendar_common/calendar_common_popover.xml | 12 ++++++------ .../calendar/calendar_year/calendar_year_popover.js | 6 ++++++ .../calendar/calendar_year/calendar_year_popover.xml | 12 ++++++------ .../calendar/filter_panel/calendar_filter_panel.js | 3 +++ .../calendar/filter_panel/calendar_filter_panel.xml | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.js b/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.js index 214f7d6072d..c36586d9173 100644 --- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.js +++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.js @@ -88,6 +88,11 @@ CalendarCommonPopover.components = { Record, }; CalendarCommonPopover.template = "web.CalendarCommonPopover"; +CalendarCommonPopover.subTemplates = { + popover: "web.CalendarCommonPopover.popover", + body: "web.CalendarCommonPopover.body", + footer: "web.CalendarCommonPopover.footer", +}; CalendarCommonPopover.props = { close: Function, record: Object, diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.xml b/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.xml index 7f3593d7847..1359769f544 100644 --- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.xml +++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_popover.xml @@ -4,14 +4,14 @@ - + - + - + @@ -25,9 +25,9 @@
- +
@@ -61,7 +61,7 @@
- +
diff --git a/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.js b/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.js index ddf42922a7a..82318121f3f 100644 --- a/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.js +++ b/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.js @@ -80,6 +80,12 @@ export class CalendarYearPopover extends Component { } CalendarYearPopover.components = { Dialog }; CalendarYearPopover.template = "web.CalendarYearPopover"; +CalendarYearPopover.subTemplates = { + popover: "web.CalendarYearPopover.popover", + body: "web.CalendarYearPopover.body", + footer: "web.CalendarYearPopover.footer", + record: "web.CalendarYearPopover.record", +}; CalendarYearPopover.props = { close: Function, date: true, diff --git a/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.xml b/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.xml index 75be5b44d70..30ac250c92b 100644 --- a/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.xml +++ b/addons/web/static/src/views/calendar/calendar_year/calendar_year_popover.xml @@ -4,14 +4,14 @@ - + - + - + @@ -22,10 +22,10 @@
- +
- +
@@ -33,7 +33,7 @@
- + diff --git a/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.js b/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.js index 35fa95b4cee..d51f30384c3 100644 --- a/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.js +++ b/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.js @@ -224,3 +224,6 @@ CalendarFilterPanel.components = { Transition, }; CalendarFilterPanel.template = "web.CalendarFilterPanel"; +CalendarFilterPanel.subTemplates = { + filter: "web.CalendarFilterPanel.filter", +}; diff --git a/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.xml b/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.xml index da6148304be..1748f32f54b 100644 --- a/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.xml +++ b/addons/web/static/src/views/calendar/filter_panel/calendar_filter_panel.xml @@ -56,7 +56,7 @@
- +