From 7b7d5a2b0e86887b8836cc18976c4d90331239a3 Mon Sep 17 00:00:00 2001 From: Sebastien Clement Date: Tue, 14 Sep 2021 09:58:04 +0200 Subject: [PATCH] :ambulance: Fix crash if next_backup is empty (if auto backup not configured) #84 --- .../rootfs/opt/nextcloud_backup/tools/cronTools.js | 2 +- .../rootfs/opt/nextcloud_backup/tools/hassioApiTools.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js index 335ecb3..ba1da05 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js @@ -77,7 +77,7 @@ class CronContainer { updateNextDate() { let date; - if (this.cronJob == null) date = "Not configured"; + if (this.cronJob == null) date = null; else date = this.cronJob.nextDate().format("MMM D, YYYY HH:mm"); let status = statusTools.getStatus(); status.next_backup = date; diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js index cad43eb..2dbcec6 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js @@ -550,8 +550,8 @@ function publish_state(state){ error_code: state.error_code, message: state.message, icon: icon, - last_backup: state.last_backup == null ? "" : new Date(state.last_backup).toISOString(), - next_backup: state.next_backup == null ? "" : new Date(state.next_backup).toISOString() + last_backup: state.last_backup == null || state.last_backup == "" ? "" : new Date(state.last_backup).toISOString(), + next_backup: state.next_backup == null || state.next_backup == "" ? "" : new Date(state.next_backup).toISOString() }, } option.json = data_state_sensor