From 91910311402c42499548285a996a5fdcdc558d85 Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Tue, 26 Dec 2023 12:36:04 +0300 Subject: [PATCH] backup extension shows alerts on check and repair inconsistency actions --- src/ext/backup/class.controller.php | 11 +++++++++-- src/ext/backup/extension.json | 2 +- src/ext/backup/loader.php | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/ext/backup/class.controller.php b/src/ext/backup/class.controller.php index 50b795a..1ed50f3 100644 --- a/src/ext/backup/class.controller.php +++ b/src/ext/backup/class.controller.php @@ -118,12 +118,17 @@ class Controller extends \ApiController ]; return; } - $html = "
". htmlspecialchars($check->report). "
"; $this->response->data = [ 'total' => 1, + 'ok' => true, 'msg' => __("backup.done"), - 'html' => $html, ]; + if ($check->report == 'OK') { + $this->response->data['alertText'] = "OK"; + } + else { + $this->response->data['html'] = "
". htmlspecialchars($check->report). "
"; + } } function postRepairInconsistency() @@ -141,7 +146,9 @@ class Controller extends \ApiController } $this->response->data = [ 'total' => 1, + 'ok' => true, 'msg' => __("backup.done"), + 'alertText' => __("backup.done"), ]; } diff --git a/src/ext/backup/extension.json b/src/ext/backup/extension.json index c69d823..1ef2a14 100644 --- a/src/ext/backup/extension.json +++ b/src/ext/backup/extension.json @@ -1,6 +1,6 @@ { "bundleId": "backup", "name": "Backup", - "version": "0.9", + "version": "1.0", "description": "Backup" } diff --git a/src/ext/backup/loader.php b/src/ext/backup/loader.php index 8ecb259..9a675d6 100644 --- a/src/ext/backup/loader.php +++ b/src/ext/backup/loader.php @@ -95,7 +95,7 @@ function onBackupFileChange(el) {
{$e('backup.d_inconsistency')}
-   +