pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: correct forward-port of 187c32c2c7

Browse Source
This commit is contained in:
Christophe Simonis
2019-01-18 15:27:22 +01:00
parent f854e01a98
commit 6e5ac01160
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/pivot/pivot_model.js
+2 -2
View File
@@ -315,8 +315,8 @@ var PivotModel = AbstractModel.extend({
if (!this.data.has_data) {
return {
has_data: false,
colGroupBys: this.data.main_col.groupbys,
rowGroupBys: this.data.main_row.groupbys,
colGroupBys: this.data.main_col.root.groupbys,
rowGroupBys: this.data.main_row.root.groupbys,
measures: this.data.measures,
};
}
addons/web/static/tests/views/pivot_tests.js
+2 -2
View File
@@ -967,7 +967,7 @@ QUnit.module('Views', {
}, "context should be correct");
pivot.$('tbody .o_pivot_header_cell_closed').click();
pivot.$('.o_pivot_field_menu li[data-field=product_id] a').click();
pivot.$('.o_pivot_field_menu .dropdown-item[data-field="product_id"]:first').click();
assert.deepEqual(pivot.getContext(), {
pivot_column_groupby: [],
@@ -976,7 +976,7 @@ QUnit.module('Views', {
}, "context should be correct");
pivot.$('thead .o_pivot_header_cell_closed').click();
pivot.$('.o_pivot_field_menu li[data-field=customer] a').click();
pivot.$('.o_pivot_field_menu .dropdown-item[data-field="customer"]:first').click();
assert.deepEqual(pivot.getContext(), {
pivot_column_groupby: ['customer'],