From ad7b0a2696998a465eaa8c60f67b26e97dc1403c Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 6 Aug 2020 13:20:25 -0600 Subject: [PATCH] Calendar: Fix resource rows were missing in planner by user --- calendar/js/et2_widget_planner.js | 2 +- calendar/js/et2_widget_planner.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js index 4082e6198c..1406e46c4f 100644 --- a/calendar/js/et2_widget_planner.js +++ b/calendar/js/et2_widget_planner.js @@ -124,7 +124,7 @@ var et2_calendar_planner = /** @class */ (function (_super) { this.invalidate(); }, this); } - else if (already_added.indexOf('' + user) < 0 && parseInt(user) >= 0) { + else if (already_added.indexOf('' + user) < 0 && (isNaN(user) || parseInt(user) >= 0)) { labels.push({ id: user, label: this._get_owner_name(user), diff --git a/calendar/js/et2_widget_planner.ts b/calendar/js/et2_widget_planner.ts index 201c9a5486..2e153fc9bc 100644 --- a/calendar/js/et2_widget_planner.ts +++ b/calendar/js/et2_widget_planner.ts @@ -453,7 +453,7 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta this.invalidate(); },this); } - else if(already_added.indexOf(''+user) < 0 && parseInt(user) >= 0) + else if(already_added.indexOf(''+user) < 0 && (isNaN(user) || parseInt(user) >= 0)) { labels.push({ id: user,