Merge PR #1589 into 12.0

Signed-off-by pedrobaeza
pull/1605/head
OCA-git-bot 2020-04-23 07:51:52 +00:00
commit 356451b1f4
1 changed files with 10 additions and 10 deletions

View File

@ -12,10 +12,10 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
PivotController.include({ PivotController.include({
custom_events: { custom_events: _.extend({}, PivotController.prototype.custom_events, {
'add_measure': '_onAddMeasure', add_measure: '_onAddMeasure',
'remove_measure': '_onRemoveMeasure', remove_measure: '_onRemoveMeasure',
}, }),
computed_measures_open: false, computed_measures_open: false,
@ -44,7 +44,7 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
/** /**
* Handle click event on measures menu to support computed measures sub-menu * Handle click event on measures menu to support computed measures sub-menu
* *
* @override * @override
*/ */
_onButtonClick: function (event) { _onButtonClick: function (event) {
@ -105,8 +105,8 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
/** /**
* Custom event to add a new measure * Custom event to add a new measure
* *
* @param {CustomEvent} ev * @param {CustomEvent} ev
*/ */
_onAddMeasure: function(ev) { _onAddMeasure: function(ev) {
this.measures[ev.data.id] = ev.data.def; this.measures[ev.data.id] = ev.data.def;
@ -115,8 +115,8 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
/** /**
* Custom event to remove a measure * Custom event to remove a measure
* *
* @param {CustomEvent} ev * @param {CustomEvent} ev
*/ */
_onRemoveMeasure: function(ev) { _onRemoveMeasure: function(ev) {
delete this.measures[ev.data.id]; delete this.measures[ev.data.id];
@ -125,7 +125,7 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
/** /**
* Set default values related with the selected operation * Set default values related with the selected operation
* *
* @param {ChangeEvent} ev * @param {ChangeEvent} ev
*/ */
_onChangeComputedMeasureOperation: function(ev) { _onChangeComputedMeasureOperation: function(ev) {