diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-07 11:43:07 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-07 11:43:07 +0200 |
| commit | 2ab7ad83618dcffd32b39e3a54ae500514444476 (patch) | |
| tree | ae4398707a5c1e126895a80429693599ba65dc17 /addons/web/static/src | |
| parent | e0591346a4ad4d256bc2e4e49bfa5a8e21f22f45 (diff) | |
| parent | c00df146547dca9c4dea6f39c1f0408ac84ec2d7 (diff) | |
[MERGE] forward port branch saas-11.3 up to c00df146547
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/scss/list_view.scss | 1 |
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 6cb91d152d0..cf3c08128ce 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -1990,9 +1990,7 @@ var BasicModel = AbstractModel.extend({ var records = []; var ids = []; list = this._applyX2ManyOperations(list); - if (_.isEmpty(list.data)) { - return $.when(); - } + _.each(list.data, function (localId) { var record = self.localData[localId]; var data = record._changes || record.data; @@ -2003,6 +2001,9 @@ var BasicModel = AbstractModel.extend({ ids.push(many2oneRecord.res_id); model = many2oneRecord.model; }); + if (!ids.length) { + return $.when(); + } return this._rpc({ model: model, method: 'name_get', diff --git a/addons/web/static/src/scss/list_view.scss b/addons/web/static/src/scss/list_view.scss index 49cba9409cc..539b5685a31 100644 --- a/addons/web/static/src/scss/list_view.scss +++ b/addons/web/static/src/scss/list_view.scss @@ -83,7 +83,6 @@ padding: 0px; background-style: none; border-style: none; - height: 0px; display: table-cell; } |
