diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-02-01 19:08:14 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-02-01 19:08:14 +0100 |
| commit | b7c7591bfba41eba5be43ec490d6da9a2c7368fe (patch) | |
| tree | 09b22c9ec50a23906dff793dc9001880ff0a7d56 /addons/web/static/src/js | |
| parent | b34917cd6d7dfd7d29ce207dcb2f70c5f491f2b4 (diff) | |
| parent | 71773e1f1cbc619da78c16ced4acd880dc685e3c (diff) | |
[MERGE] forward port branch saas-11 up to 71773e1f1cb
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 77c0f059354..2293f2dac6f 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -186,7 +186,7 @@ var PivotView = View.extend({ this.initial_row_groupby = context.pivot_row_groupby || this.initial_row_groupby; this.initial_col_groupby = context.pivot_col_groupby || this.initial_col_groupby; } - this.main_row.groupbys = group_by.length ? group_by : this.initial_row_groupby.slice(0); + this.main_row.groupbys = group_by.length ? group_by : (context.pivot_row_groupby || this.initial_row_groupby.slice(0)); this.main_col.groupbys = context.pivot_column_groupby || this.initial_col_groupby.slice(0); this.active_measures = context.pivot_measures || this.active_measures; @@ -206,6 +206,10 @@ var PivotView = View.extend({ this.do_push_state({}); return this.data_loaded.done(function () { self.display_table(); + self.$buttons.find('.o_pivot_measures_list li').removeClass('selected'); + self.active_measures.forEach(function (measure) { + self.$buttons.find('li[data-field="' + measure + '"]').addClass('selected'); + }); _super(); }); }, |