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

[FIX] web: DataModel _postprocess was called at a wrong time

Browse Source 
The _postprocess method should always be called after _parseServerData,
otherwise the localData between each call is inconsistent for the
relational fields (Array or key pointing to another localData).
This commit is contained in:
qsm-odoo
2017-04-11 19:44:38 +02:00
committed by Aaron Bohy
parent a52690c26c
commit ba1a2d7145
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/basic/basic_model.js
+11 -8
View File
@@ -1320,13 +1320,14 @@ var BasicModel = AbstractModel.extend({
.then(function (result) {
result = result[0];
record.data = _.extend({}, record.data, result);
}).then(function () {
})
.then(function () {
self._parseServerData(fieldNames, record.fields, record.data);
})
.then(function () {
return self._fetchX2Manys(record, oldData, fieldNames).then(function () {
return self._postprocess(record);
});
}).then(function (record) {
self._parseServerData(fieldNames, record.fields, record.data);
return record;
});
},
/**
@@ -1836,7 +1837,8 @@ var BasicModel = AbstractModel.extend({
var field_values = _.mapObject(record.data, function (val, key) {
var fieldType = record.fields[key].type;
if (fieldType === 'many2one') {
return val instanceof Array && val[0];
var element = self.localData[val];
return element && element.data.id || false;
}
return val;
});
@@ -1864,13 +1866,14 @@ var BasicModel = AbstractModel.extend({
defs.push(fetch_status_information);
}
if (options.always_reload) {
if (record.data[name] instanceof Array) {
if (record.fields[name].type === 'many2one' && record.data[name]) {
var element = self.localData[record.data[name]];
defs.push(self._rpc(field.relation, 'name_get')
.args([record.data[name][0]])
.args([element.data.id])
.withContext(self._getContext(record, {fieldName: name}))
.exec()
.then(function (result) {
record.data[name] = result[0];
element.data.display_name = result[0][1];
}));
}
}