From 6ba8db35d1e0954ee7a706c3e220dbc490decbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 30 Oct 2017 11:35:51 +0100 Subject: [PATCH] Update field description when adding existing field issue6886 review42781002 --- src/model.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/model.js b/src/model.js index 174c466e6c..f009fee239 100644 --- a/src/model.js +++ b/src/model.js @@ -13,13 +13,14 @@ add_fields: function(descriptions) { var added = []; for (var name in descriptions) { - if (descriptions.hasOwnProperty(name) && - (!(name in this.fields))) { - var desc = descriptions[name]; - var Field = Sao.field.get(desc.type); - this.fields[name] = new Field(desc); - added.push(name); - } + var desc = descriptions[name]; + if (!(name in this.fields)) { + var Field = Sao.field.get(desc.type); + this.fields[name] = new Field(desc); + added.push(name); + } else { + jQuery.extend(this.fields[name].description, desc); + } } return added; },