diff options
| author | Jeremy Kersten <jke@odoo.com> | 2020-07-29 12:40:13 +0000 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2020-08-12 13:46:37 +0000 |
| commit | 8d343648744e9ee9a1375034b59d5a7fc83a4ff0 (patch) | |
| tree | e53f92e4207548f32c57216dc7ecccb56f971412 /addons/website_event | |
| parent | ebac669b2e1f2b71ce8b3ad9b277193c5e0db69f (diff) | |
[IMP] website_event,sale_*,slides: use is_view_active
Use is_view_active instead of viewref which one is cached.
closes odoo/odoo#55816
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/website_event')
| -rw-r--r-- | addons/website_event/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index e814ea851b5..31a930d6e66 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -61,8 +61,6 @@ class WebsiteEventController(http.Controller): ("date_begin", "<", sdn(today))], 0], get_month_filter_domain('month', 0), - get_month_filter_domain('nextmonth1', 1), - get_month_filter_domain('nextmonth2', 2), ['old', _('Past Events'), [ ("date_end", "<", sd(today))], 0], diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 1121e7e2c0e..638738526b8 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -6,8 +6,8 @@ <t t-call="website.layout"> <div id="wrap" class="o_wevent_index"> <!-- Options --> - <t t-set="opt_events_list_cards" t-value="request.website.viewref('website_event.opt_events_list_cards').active"/> - <t t-set="opt_events_list_columns" t-value="request.website.viewref('website_event.opt_events_list_columns').active"/> + <t t-set="opt_events_list_cards" t-value="is_view_active('website_event.opt_events_list_cards')"/> + <t t-set="opt_events_list_columns" t-value="is_view_active('website_event.opt_events_list_columns')"/> <!-- Topbar --> <t t-call="website_event.index_topbar"/> <!-- Drag/Drop Area --> @@ -164,7 +164,7 @@ <!-- Index - Events list --> <template id="events_list" name="Events list"> <!-- Options --> - <t t-set="opt_index_sidebar" t-value="request.website.viewref('website_event.opt_index_sidebar').active"/> + <t t-set="opt_index_sidebar" t-value="is_view_active('website_event.opt_index_sidebar')"/> <t t-if="opt_events_list_columns" t-set="opt_event_size" t-value="opt_index_sidebar and 'col-md-6' or 'col-md-6 col-lg-4'"/> <t t-else="" t-set="opt_event_size" t-value="opt_index_sidebar and 'col-12' or 'col-xl-10 offset-xl-1'"/> <!-- No events --> |