Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2705 into 16.0 

Signed-off-by ChrisOForgeFlow
pull/2716/head
OCA-git-bot 2024-01-05 12:38:20 +00:00
parent cf0dc773cd 62d36f4046
commit b801538bf5
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js
View File

@ -133,16 +133,22 @@ export class X2Many2DMatrixRenderer extends Component {
getValueFieldProps(column, row) { getValueFieldProps(column, row) {
const x = this.columns.findIndex((c) => c.value === column); const x = this.columns.findIndex((c) => c.value === column);
const y = this.rows.findIndex((r) => r.value === row); const y = this.rows.findIndex((r) => r.value === row);
const props = this.list.activeFields[this.matrixFields.value].props; const {props, propsFromAttrs} = this.list.activeFields[this.matrixFields.value];
const propsFromAttrs = let record = null;
this.list.activeFields[this.matrixFields.value].propsFromAttrs; let value = null;
const record = this.matrix[y][x].records[0]; if (
let value = this.matrix[y][x].value; this.matrix[y] &&
if (!this._canAggregate()) { this.matrix[y][x] &&
value = record.data[this.matrixFields.value]; (record = this.matrix[y][x].records[0])
) {
record = this.matrix[y][x].records[0];
value = this.matrix[y][x].value;
} }
value =
return { !this._canAggregate() && record
? record.data[this.matrixFields.value]
: value;
const result = {
...props, ...props,
...propsFromAttrs, ...propsFromAttrs,
value: value, value: value,
@ -151,6 +157,10 @@ export class X2Many2DMatrixRenderer extends Component {
record: record, record: record,
name: this.matrixFields.value, name: this.matrixFields.value,
}; };
if (value === null) {
result.readonly = true;
}
return result;
} }
} }