summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorRomainLibert <rli@odoo.com>2018-07-10 13:02:35 +0200
committerRomainLibert <rli@odoo.com>2018-07-11 13:47:01 +0200
commit8a21e27377bb65c03ca9b4a67b228ce21519a3e9 (patch)
treefec978aa89d94377f71edbc9aa14c2a68a35c064 /addons/web/static/src
parentc002e2eb379e8a3db90b45269f8ff2b7e246c8b2 (diff)
[IMP] web: add auto sorting on pivot view
We add the attribute default_order on the pivot view (already present in graph view), this attribute will sort the pivot view on the given measure. Closes: #25675
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/pivot/pivot_model.js11
-rw-r--r--addons/web/static/src/js/views/pivot/pivot_view.js1
2 files changed, 11 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index b45f7a9ffdf..6001b25b3a5 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -238,9 +238,12 @@ var PivotModel = AbstractModel.extend({
* @param {string[]} params.colGroupBys
* @param {string[]} params.measures
* @param {Object} params.fields
+ * @param {string} params.default_order
* @returns {Deferred}
*/
load: function (params) {
+ var self = this;
+
this.initialDomain = params.domain;
this.initialRowGroupBys = params.context.pivot_row_groupby || params.rowGroupBys;
this.fields = params.fields;
@@ -254,7 +257,13 @@ var PivotModel = AbstractModel.extend({
sorted_column: {},
};
this.defaultGroupedBy = params.groupedBy;
- return this._loadData();
+
+ return this._loadData().then(function () {
+ if (params.default_order) {
+ var info = params.default_order.split(' ');
+ self.sortRows(self.data.main_col.root.id, info[0], info[1] === 'desc');
+ }
+ });
},
/**
* @override
diff --git a/addons/web/static/src/js/views/pivot/pivot_view.js b/addons/web/static/src/js/views/pivot/pivot_view.js
index 643ee68a498..9ed3835a39a 100644
--- a/addons/web/static/src/js/views/pivot/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot/pivot_view.js
@@ -95,6 +95,7 @@ var PivotView = AbstractView.extend({
this.loadParams.colGroupBys = colGroupBys;
this.loadParams.rowGroupBys = rowGroupBys;
this.loadParams.fields = this.fields;
+ this.loadParams.default_order = params.default_order || this.arch.attrs.default_order;
this.controllerParams.title = params.title || this.arch.attrs.string || _t("Untitled");
this.controllerParams.enableLinking = !this.arch.attrs.disable_linking;