diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-09 17:03:07 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-09 17:03:07 +0100 |
| commit | 6e25eb9b05780e14257deee643db76acd37dc70c (patch) | |
| tree | e782ca0b27bc8ad15ab1e9165d206bc7832dc2ec /addons/web/static/src | |
| parent | 81d1296323fdaeb88c37bde45f7443afd6ebd0ac (diff) | |
| parent | 4c410ee6a17a454e2653cc2ce9aadad64c87a86b (diff) | |
[MERGE] forward port branch saas-16 up to 4c410ee6a17
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index 78e9216be62..3621b7c1227 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -97,11 +97,13 @@ var x2ManyCommands = { // (0, virtualID, {values}) CREATE: 0, create: function (virtualID, values) { + delete values.id; return [x2ManyCommands.CREATE, virtualID || false, values]; }, // (1, id, {values}) UPDATE: 1, update: function (id, values) { + delete values.id; return [x2ManyCommands.UPDATE, id, values]; }, // (2, id[, _]) @@ -2669,7 +2671,6 @@ var BasicModel = AbstractModel.extend({ _.each(relRecordUpdated, function (relRecord) { var changes = self._generateChanges(relRecord, options); if (!_.isEmpty(changes)) { - delete changes.id; var command = x2ManyCommands.update(relRecord.res_id, changes); commands[fieldName].push(command); } @@ -2689,7 +2690,6 @@ var BasicModel = AbstractModel.extend({ relRecord = _.findWhere(relRecordUpdated, {res_id: list.res_ids[i]}); changes = relRecord ? this._generateChanges(relRecord, options) : {}; if (!_.isEmpty(changes)) { - delete changes.id; command = x2ManyCommands.update(relRecord.res_id, changes); didChange = true; } else { @@ -2700,7 +2700,7 @@ var BasicModel = AbstractModel.extend({ // this is a new id (maybe existing in DB, but new in JS) relRecord = _.findWhere(relRecordAdded, {res_id: list.res_ids[i]}); changes = this._generateChanges(relRecord, options); - if ('id' in changes) { + if (changes.id) { // the subrecord already exists in db delete changes.id; if (this.isNew(record.id)) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4d808a66f60..0371bd7ec84 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -835,7 +835,7 @@ <t t-foreach="elements" t-as="el"> <t t-set="color" t-value="el[colorField] || 0"/> <span t-attf-class="badge dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id"> - <span class="o_badge_text"><t t-raw="el.display_name"/></span> + <span class="o_badge_text"><t t-esc="el.display_name"/></span> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> </t> |