From e44fbc880b7b8656d1b833c1153a0cbd3500dd54 Mon Sep 17 00:00:00 2001 From: szaimen Date: Tue, 26 Apr 2022 15:22:00 +0200 Subject: [PATCH] improve wording regarding daily backup Signed-off-by: szaimen --- php/src/Cron/UpdateNotification.php | 4 ++-- php/templates/containers.twig | 8 ++++---- tests/QA/020-backup-and-restore.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/php/src/Cron/UpdateNotification.php b/php/src/Cron/UpdateNotification.php index ab40653a..e1d57f6a 100644 --- a/php/src/Cron/UpdateNotification.php +++ b/php/src/Cron/UpdateNotification.php @@ -22,9 +22,9 @@ $isMastercontainerUpdateAvailable = $dockerActionManger->IsMastercontainerUpdate $isAnyUpdateAvailable = $dockerActionManger->isAnyUpdateAvailable(); if ($isMastercontainerUpdateAvailable === true) { - $dockerActionManger->sendNotification($nextcloudContainer, 'Mastercontainer update available!', 'Please open your management interface to update it.'); + $dockerActionManger->sendNotification($nextcloudContainer, 'Mastercontainer update available!', 'Please open your AIO interface to update it. If you do not want to do it manually each time, you can enable the daily backup feature from the AIO interface which also automatically updates the mastercontainer.'); } if ($isAnyUpdateAvailable === true) { - $dockerActionManger->sendNotification($nextcloudContainer, 'Container updates available!', 'Please open your management interface to update them.'); + $dockerActionManger->sendNotification($nextcloudContainer, 'Container updates available!', 'Please open your AIO interface to update them. If you do not want to do it manually each time, you can enable the daily backup feature from the AIO interface which also automatically updates your containers and your Nextcloud apps.'); } diff --git a/php/templates/containers.twig b/php/templates/containers.twig index 28542f98..44defd04 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -51,7 +51,7 @@ {% if is_daily_backup_running == true %} Daily backup currently running. (Logs)

- It will update all containers and all apps if the backup is successful.

+ It will update your containers, the mastercontainer and your Nextcloud apps if the backup is successful.

{% if is_mastercontainer_update_available == true %} Since the mastercontainer gets updated, it will restart the container which will make it unavailable for a moment. (Logs)

{% endif %} @@ -347,7 +347,7 @@ -

Daily backup creation

+

Daily backup

{% if daily_backup_time == "" %} By entering a time below, you can enable daily backups. It will create them at the entered time in 24h format. E.g. 04:00 will create backups at 4 am UTC and 16:00 at 4 pm UTC.

@@ -356,9 +356,9 @@
- This option will also automatically update your containers and apps and will send a notification about the result of the backup.

+ This option will also automatically update your containers, the mastercontainer and your Nextcloud apps and will send a notification about the result of the backup.

{% else %} - Daily backups will be created at {{ daily_backup_time }} UTC which includes a notification about the result of the backup and automatic updates of your containers and apps. You can disable this option again by clicking on the button below.

+ Daily backups will be created at {{ daily_backup_time }} UTC which includes a notification about the result of the backup and automatic updates of your containers, the mastercontainer and your Nextcloud apps. You can disable this option again by clicking on the button below.

diff --git a/tests/QA/020-backup-and-restore.md b/tests/QA/020-backup-and-restore.md index 60e92f8b..dad3b45d 100644 --- a/tests/QA/020-backup-and-restore.md +++ b/tests/QA/020-backup-and-restore.md @@ -1,11 +1,11 @@ # Backup and restore -- [ ] Expanding all backup options in the Backup and restore sectioin should reveal a Backup information section, Backup creation section, Backup check section, Backup restore section and Daily backup creation section. +- [ ] Expanding all backup options in the Backup and restore sectioin should reveal a Backup information section, Backup creation section, Backup check section, Backup restore section and a Daily backup section. - [ ] The backup restore section should list all available backup archives and list them from most recent to least recent. - [ ] Clicking on either option of Create backup, Check backup integrity or Restore selected backup should run the corresponding action and report after a while in the last check, backup or restore was successful. - [ ] Daily backup creatio should allow to enter a time in 24h format e.g. `04:00` should be accepted, `24:00` or `dfjlk` not. -- [ ] Submitting a time here that is only a minute away should reload the page and reveal at the same place the option to delete the setting again. -- [ ] When the time of the automatic backup has come, it should automatically log you out (you can verify by reloading) and after you log in again you should see that the automatic backup is currently running. +- [ ] Submitting a time here should reload the page and reveal at the same place the option to delete the setting again. +- [ ] When the time of the automatic backup has come (you can test it by choosing a time that is e.g. only a minute away), it should automatically log you out (you can verify by reloading) and after you log in again you should see that the automatic backup is currently running. - [ ] After a while you should see that your container are starting and in the Backup and restore section you should see that the backup was successful You can now continue with [030-aio-password-change.md](./030-aio-password-change.md) \ No newline at end of file