From aff958e21b4534ca36edf1e4b5d05b1a1e1ddbe2 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Thu, 16 Jul 2020 16:55:06 +0200 Subject: [PATCH] [IMP] kpi_dashboard: Allow to set a context on the action --- kpi_dashboard/models/kpi_kpi.py | 10 ++++++---- kpi_dashboard/static/src/js/widget/abstract_widget.js | 5 ++++- kpi_dashboard/static/src/xml/dashboard.xml | 5 +++-- kpi_dashboard/views/kpi_kpi.xml | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/kpi_dashboard/models/kpi_kpi.py b/kpi_dashboard/models/kpi_kpi.py index 795eab19..b67e506a 100644 --- a/kpi_dashboard/models/kpi_kpi.py +++ b/kpi_dashboard/models/kpi_kpi.py @@ -187,15 +187,17 @@ class KpiKpiAction(models.Model): ('ir.actions.client', 'ir.actions.client')], required=True, ) + context = fields.Char() def read_dashboard(self): - result = [] + result = {} for r in self: - result.append({ + result[r.id] = { 'id': r.action.id, 'type': r.action._name, - 'name': r.action.name - }) + 'name': r.action.name, + 'context': safe_eval(r.context or '{}') + } return result diff --git a/kpi_dashboard/static/src/js/widget/abstract_widget.js b/kpi_dashboard/static/src/js/widget/abstract_widget.js index 0babc377..470054f3 100644 --- a/kpi_dashboard/static/src/js/widget/abstract_widget.js +++ b/kpi_dashboard/static/src/js/widget/abstract_widget.js @@ -82,7 +82,10 @@ odoo.define('kpi_dashboard.AbstractWidget', function (require) { _onClickDirectAction: function(event) { event.preventDefault(); var $data = $(event.currentTarget).closest('a'); - return this.do_action($($data).data('id')); + var action = this.actions[$($data).data('id')]; + return this.do_action(action.id, { + additional_context: action.context + }); } }); diff --git a/kpi_dashboard/static/src/xml/dashboard.xml b/kpi_dashboard/static/src/xml/dashboard.xml index c9c81541..619d1853 100644 --- a/kpi_dashboard/static/src/xml/dashboard.xml +++ b/kpi_dashboard/static/src/xml/dashboard.xml @@ -19,9 +19,10 @@ - + + diff --git a/kpi_dashboard/views/kpi_kpi.xml b/kpi_dashboard/views/kpi_kpi.xml index ec36a48e..6f96f5fb 100644 --- a/kpi_dashboard/views/kpi_kpi.xml +++ b/kpi_dashboard/views/kpi_kpi.xml @@ -104,6 +104,7 @@ +