summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/services
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-11-28 16:57:58 +0100
committerChristophe Simonis <chs@odoo.com>2017-11-28 16:57:58 +0100
commit29590a61cda332a691d4edcdcef2c0dc6499394d (patch)
treed4fca4b50f5b40c90ce013f6748d18b95e541228 /addons/web/static/src/js/services
parentf132c8862fb3416cb53c559be32acd880c3a1c7d (diff)
parent8fb25e185bb2e78ce7864205b4338022b2f44909 (diff)
[MERGE] forward port branch 11.0 up to 8fb25e185bb
Diffstat (limited to 'addons/web/static/src/js/services')
-rw-r--r--addons/web/static/src/js/services/data_manager.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/services/data_manager.js b/addons/web/static/src/js/services/data_manager.js
index 449961dd4b8..47cd29399b5 100644
--- a/addons/web/static/src/js/services/data_manager.js
+++ b/addons/web/static/src/js/services/data_manager.js
@@ -423,8 +423,12 @@ return core.Class.extend({
if (fieldsInfo[node.attrs.name].fieldDependencies) {
var deps = fieldsInfo[node.attrs.name].fieldDependencies;
for (var dependency_name in deps) {
+ var dependency_dict = {name: dependency_name, type: deps[dependency_name].type};
if (!(dependency_name in fieldsInfo)) {
- fieldsInfo[dependency_name] = {'name': dependency_name, 'type': deps[dependency_name].type, 'options': deps[dependency_name].options || {}};
+ fieldsInfo[dependency_name] = _.extend({}, dependency_dict, {options: deps[dependency_name].options || {}});
+ }
+ if (!(dependency_name in fields)) {
+ fields[dependency_name] = dependency_dict;
}
}
}