summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-06 15:46:36 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-06 15:46:36 +0200
commit969eb3fa2f9fe78e3f01a6d4caca1aeae753c58c (patch)
tree25e7833ea517141e4e900305288e1c242dabac46 /addons/web/static/src
parent976499ac782f9704bf1eb26067b5c4b3a9b22b24 (diff)
parentc834c0f5879c0e5023645b4a8a57c1b19a9eee18 (diff)
[MERGE] forward port branch saas-11.2 up to c834c0f5879
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js7
-rw-r--r--addons/web/static/src/less/list_view.less1
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 4c2b213243f..c6f67bc23fa 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/less/list_view.less b/addons/web/static/src/less/list_view.less
index 666b4a8e116..e56e94fff93 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -84,7 +84,6 @@
padding: 0px;
background-style: none;
border-style: none;
- height: 0px;
display: table-cell;
}