audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP+FIX] web_pivot_computed_measure: Time Ranges Comparison + Change custom_events addition

Browse Source 
[IMP] web_pivot_computed_measure: Time Ranges Comparison

[FIX] web_pivot_computed_measure: Change custom_events addition

Previous this commit, the controller events are discarted. With this commit
the existing events are respected
This commit is contained in:
Alexandre Díaz
2020-04-02 17:10:58 +02:00
committed by CarlosRoca13
parent b9bc3561ce
commit 993fb98ad2
4 changed files with 83 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web_pivot_computed_measure/static/src/js/pivot_controller.js
View File

@@ -12,10 +12,10 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
PivotController.include({
custom_events: {
'add_measure': '_onAddMeasure',
'remove_measure': '_onRemoveMeasure',
},
custom_events: _.extend({}, PivotController.prototype.custom_events, {
add_measure: '_onAddMeasure',
remove_measure: '_onRemoveMeasure',
}),
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
*
*
* @override
*/
_onButtonClick: function (event) {
@@ -105,8 +105,8 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
/**
* Custom event to add a new measure
*
* @param {CustomEvent} ev
*
* @param {CustomEvent} ev
*/
_onAddMeasure: function(ev) {
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
*
* @param {CustomEvent} ev
*
* @param {CustomEvent} ev
*/
_onRemoveMeasure: function(ev) {
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
*
*
* @param {ChangeEvent} ev
*/
_onChangeComputedMeasureOperation: function(ev) {