summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomainLibert <rli@odoo.com>2019-09-09 14:04:12 +0000
committerRomainLibert <rli@odoo.com>2019-09-09 14:04:12 +0000
commit988e201d2ec20b693096dff3318cc62ce40ccb45 (patch)
tree0ebdb5881553f20af795427364d4e43133aeebb0
parent25bba057100dbfe28dcd81109c30dee30b8b19f6 (diff)
[FIX] lunch: allow location_id to be NULL
In case the last location of a user was NULL in databse, lunch was crashing because lunch_kanban was adding an undefined leaf to the load domain. closes odoo/odoo#36571 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
-rw-r--r--addons/lunch/static/src/js/lunch_kanban_model.js22
1 files changed, 13 insertions, 9 deletions
diff --git a/addons/lunch/static/src/js/lunch_kanban_model.js b/addons/lunch/static/src/js/lunch_kanban_model.js
index 1e17b489e5f..d94812a6c3c 100644
--- a/addons/lunch/static/src/js/lunch_kanban_model.js
+++ b/addons/lunch/static/src/js/lunch_kanban_model.js
@@ -33,7 +33,7 @@ var LunchKanbanModel = KanbanModel.extend({
getLocationDomain: function () {
var self = this;
return this._initUserLocation().then(function () {
- return [self._buildLocationDomainLeaf()];
+ return self._buildLocationDomainLeaf() ? [self._buildLocationDomainLeaf()]: [];
});
},
load: function () {
@@ -62,15 +62,19 @@ var LunchKanbanModel = KanbanModel.extend({
//--------------------------------------------------------------------------
_addOrUpdate: function (domain, subDomain) {
- var key = subDomain[0];
- var index = _.findIndex(domain, function (val) {
- return val[0] === key;
- });
+ if (subDomain && subDomain.length) {
+ var key = subDomain[0];
+ var index = _.findIndex(domain, function (val) {
+ return val[0] === key;
+ });
+
+ if (index < 0) {
+ domain.push(subDomain);
+ } else {
+ domain[index] = subDomain;
+ }
- if (index < 0) {
- domain.push(subDomain);
- } else {
- domain[index] = subDomain;
+ return domain;
}
return domain;