From ec1eb3833634b4c080bd4805ce027e6aa0520d5e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 21 Apr 2023 13:27:18 +0200 Subject: [PATCH 1/2] #10972 fix null calendar alerts correlation --- .../include/javascript/pandora_fullcalendar.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/javascript/pandora_fullcalendar.js b/pandora_console/include/javascript/pandora_fullcalendar.js index 853405eb1c..d800110826 100644 --- a/pandora_console/include/javascript/pandora_fullcalendar.js +++ b/pandora_console/include/javascript/pandora_fullcalendar.js @@ -445,7 +445,12 @@ function save_data_input(calendar) { // eslint-disable-next-line no-unused-vars function loadEventBBDD(events) { - if (events == undefined || events === null || events === "") { + if ( + events == undefined || + events === null || + events === "null" || + events === "" + ) { $(".alert_schedule").show(); return {}; } @@ -482,6 +487,7 @@ function loadEventBBDD(events) { }); var result = []; + console.log(events); Object.entries(JSON.parse(events)).forEach(function(element) { var day_string = element[0]; var events_day = element[1]; From 55485c43b251029567888dabf33b44098b83aeea Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 24 Apr 2023 07:51:00 +0200 Subject: [PATCH 2/2] #10972 remove console.log fullcalendar.js --- pandora_console/include/javascript/pandora_fullcalendar.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/javascript/pandora_fullcalendar.js b/pandora_console/include/javascript/pandora_fullcalendar.js index d800110826..1d07e1974f 100644 --- a/pandora_console/include/javascript/pandora_fullcalendar.js +++ b/pandora_console/include/javascript/pandora_fullcalendar.js @@ -487,7 +487,6 @@ function loadEventBBDD(events) { }); var result = []; - console.log(events); Object.entries(JSON.parse(events)).forEach(function(element) { var day_string = element[0]; var events_day = element[1];