composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show real next backup date (#196)

Browse Source 
* Get the next backup date from what is scheduled in the background task.
* Show different message if cron is not running.
This commit is contained in:
Thomas Casteleyn
2021-06-30 14:59:36 +02:00
committed by GitHub
parent c7d87ad5b0
commit 94f662c71a
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-backup/dictionaries/en.dict.itop-backup.php
View File

@@ -49,7 +49,8 @@ Dict::Add('EN US', 'English', 'English', array(
'bkp-status-backups-auto' => 'Scheduled backups', 'bkp-status-backups-auto' => 'Scheduled backups',
'bkp-status-backups-manual' => 'Manual backups', 'bkp-status-backups-manual' => 'Manual backups',
'bkp-status-backups-none' => 'No backup yet', 'bkp-status-backups-none' => 'No backup yet',
'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s', 'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.',
'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.',
'bkp-button-backup-now' => 'Backup now!', 'bkp-button-backup-now' => 'Backup now!',
'bkp-button-restore-now' => 'Restore!', 'bkp-button-restore-now' => 'Restore!',
'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.',

21
datamodels/2.x/itop-backup/status.php
View File

@@ -337,18 +337,29 @@ try {
); );
} }
// Do backup now // Next occurrence
// //
$oBackupExec = new BackupExec(); /** @var \BackgroundTask $oTask */
$oNext = $oBackupExec->GetNextOccurrence(); $oTask = MetaModel::GetObjectByName(BackgroundTask::class, BackupExec::class, false);
$sNextOccurrence = Dict::Format('bkp-next-backup', $aWeekDayToString[$oNext->Format('N')], $oNext->Format('Y-m-d'), if ($oTask)
$oNext->Format('H:i')); {
$oTimezone = new DateTimeZone(MetaModel::GetConfig()->Get('timezone'));
$oNext = new DateTime($oTask->Get('next_run_date'), $oTimezone);
$sNextOccurrence = Dict::Format('bkp-next-backup', $aWeekDayToString[$oNext->Format('N')], $oNext->Format('Y-m-d'),
$oNext->Format('H:i'));
}
else
{
$sNextOccurrence = Dict::S('bkp-next-backup-unknown');
}
$oFieldsetBackupNow->AddSubBlock( $oFieldsetBackupNow->AddSubBlock(
AlertUIBlockFactory::MakeForInformation('', $sNextOccurrence) AlertUIBlockFactory::MakeForInformation('', $sNextOccurrence)
->SetIsClosable(false) ->SetIsClosable(false)
->SetIsCollapsible(false) ->SetIsCollapsible(false)
); );
// Do backup now
//
$oLaunchBackupButton = ButtonUIBlockFactory::MakeForPrimaryAction(Dict::S('bkp-button-backup-now')); $oLaunchBackupButton = ButtonUIBlockFactory::MakeForPrimaryAction(Dict::S('bkp-button-backup-now'));
$oLaunchBackupButton->SetOnClickJsCode('LaunchBackupNow();'); $oLaunchBackupButton->SetOnClickJsCode('LaunchBackupNow();');
$oFieldsetBackupNow->AddSubBlock($oLaunchBackupButton); $oFieldsetBackupNow->AddSubBlock($oLaunchBackupButton);