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

[FIX] web: list: buttons with attrs column_invisible

Browse Source 
Since commit 042b4060bd, attrs 'column_invisible' on button was
ignored. This commit makes this work alongside the adjacent button
grouping feature: if all adjacent buttons have their attrs
column_invisible evaluated to true, no column is rendered for this
group of adjacent buttons.

closes odoo/odoo#53489

X-original-commit: 3110e34ab8e5ec3bf7160655af21f72b4d2179db
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
This commit is contained in:
Aaron Bohy
2020-06-23 09:03:34 +00:00
parent 7a4e90de8a
commit 61a3a4d52d
2 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/list/list_renderer.js
+13 -6
View File
@@ -66,7 +66,7 @@ var ListRenderer = BasicRenderer.extend({
init: function (parent, state, params) {
this._super.apply(this, arguments);
this._preprocessColumns();
this.columnInvisibleFields = params.columnInvisibleFields;
this.columnInvisibleFields = params.columnInvisibleFields || {};
this.rowDecorations = this._extractDecorationAttrs(this.arch);
this.fieldDecorations = {};
for (const field of this.arch.children.filter(c => c.tag === 'field')) {
@@ -86,7 +86,7 @@ var ListRenderer = BasicRenderer.extend({
* @override
*/
willStart: function () {
this._processColumns(this.columnInvisibleFields || {});
this._processColumns(this.columnInvisibleFields);
return this._super.apply(this, arguments);
},
@@ -108,7 +108,8 @@ var ListRenderer = BasicRenderer.extend({
updateState: function (state, params) {
this._setState(state);
this.isGrouped = this.state.groupedBy.length > 0;
this._processColumns(params.columnInvisibleFields || {});
this.columnInvisibleFields = params.columnInvisibleFields || {};
this._processColumns(this.columnInvisibleFields);
if (params.selectedRecords) {
this.selection = params.selectedRecords;
}
@@ -369,7 +370,11 @@ var ListRenderer = BasicRenderer.extend({
var reject = c.attrs.modifiers.column_invisible;
// If there is an evaluated domain for the field we override the node
// attribute to have the evaluated modifier value.
if (c.attrs.name in columnInvisibleFields) {
if (c.tag === "button_group") {
// FIXME: 'column_invisible' attribute is available for fields *and* buttons,
// so 'columnInvisibleFields' variable name is misleading, it should be renamed
reject = c.children.every(child => columnInvisibleFields[child.attrs.name]);
} else if (c.attrs.name in columnInvisibleFields) {
reject = columnInvisibleFields[c.attrs.name];
}
if (!reject && c.attrs.widget === 'handle') {
@@ -523,7 +528,9 @@ var ListRenderer = BasicRenderer.extend({
if (node.tag === 'button_group') {
for (const buttonNode of node.children) {
$td.append(this._renderButton(record, buttonNode));
if (!this.columnInvisibleFields[buttonNode.attrs.name]) {
$td.append(this._renderButton(record, buttonNode));
}
}
return $td;
} else if (node.tag === 'widget') {
@@ -1237,7 +1244,7 @@ var ListRenderer = BasicRenderer.extend({
keyParts: this._getOptionalColumnsStorageKeyParts(),
optionalColumnsEnabled: this.optionalColumnsEnabled,
});
this._processColumns(this.columnInvisibleFields || {});
this._processColumns(this.columnInvisibleFields);
this._render().then(function () {
self._onToggleOptionalColumnDropdown(ev);
});
addons/web/static/tests/fields/relational_fields/field_one2many_tests.js
+88
View File
@@ -8444,6 +8444,94 @@ QUnit.module('fields', {}, function () {
form.destroy();
});
QUnit.test('column_invisible attrs on a button in a one2many list', async function (assert) {
assert.expect(6);
this.data.partner.records[0].p = [2];
const form = await createView({
View: FormView,
model: 'partner',
data: this.data,
arch: `
<form>
<field name="product_id"/>
<field name="p">
<tree>
<field name="foo"/>
<button name="abc" string="Do it" class="some_button" attrs="{'column_invisible': [('parent.product_id', '=', False)]}"/>
</tree>
</field>
</form>`,
res_id: 1,
viewOptions: {
mode: 'edit',
},
});
assert.strictEqual(form.$('.o_field_widget[name=product_id] input').val(), '');
assert.containsN(form, '.o_list_table th', 2); // foo + trash bin
assert.containsNone(form, '.some_button');
await testUtils.fields.many2one.clickOpenDropdown('product_id');
await testUtils.fields.many2one.clickHighlightedItem('product_id');
assert.strictEqual(form.$('.o_field_widget[name=product_id] input').val(), 'xphone');
assert.containsN(form, '.o_list_table th', 3); // foo + button + trash bin
assert.containsOnce(form, '.some_button');
form.destroy();
});
QUnit.test('column_invisible attrs on adjacent buttons', async function (assert) {
assert.expect(14);
this.data.partner.records[0].p = [2];
const form = await createView({
View: FormView,
model: 'partner',
data: this.data,
arch: `
<form>
<field name="product_id"/>
<field name="trululu"/>
<field name="p">
<tree>
<button name="abc1" string="Do it 1" class="some_button1"/>
<button name="abc2" string="Do it 2" class="some_button2" attrs="{'column_invisible': [('parent.product_id', '!=', False)]}"/>
<field name="foo"/>
<button name="abc3" string="Do it 3" class="some_button3" attrs="{'column_invisible': [('parent.product_id', '!=', False)]}"/>
<button name="abc4" string="Do it 4" class="some_button4" attrs="{'column_invisible': [('parent.trululu', '!=', False)]}"/>
</tree>
</field>
</form>`,
res_id: 1,
viewOptions: {
mode: 'edit',
},
});
assert.strictEqual(form.$('.o_field_widget[name=product_id] input').val(), '');
assert.strictEqual(form.$('.o_field_widget[name=trululu] input').val(), 'aaa');
assert.containsN(form, '.o_list_table th', 4); // button group 1 + foo + button group 2 + trash bin
assert.containsOnce(form, '.some_button1');
assert.containsOnce(form, '.some_button2');
assert.containsOnce(form, '.some_button3');
assert.containsNone(form, '.some_button4');
await testUtils.fields.many2one.clickOpenDropdown('product_id');
await testUtils.fields.many2one.clickHighlightedItem('product_id');
assert.strictEqual(form.$('.o_field_widget[name=product_id] input').val(), 'xphone');
assert.strictEqual(form.$('.o_field_widget[name=trululu] input').val(), 'aaa');
assert.containsN(form, '.o_list_table th', 3); // button group 1 + foo + trash bin
assert.containsOnce(form, '.some_button1');
assert.containsNone(form, '.some_button2');
assert.containsNone(form, '.some_button3');
assert.containsNone(form, '.some_button4');
form.destroy();
});
QUnit.test('one2many column visiblity depends on onchange of parent field', async function (assert) {
assert.expect(3);