Commit aacec077 authored by Henrique Mendes's avatar Henrique Mendes Committed by Damien McKenna
Browse files

Issue #3262070 by WagnerMelo, Anybody, Grevil, hmendes, andregp,... 

Issue #3262070 by WagnerMelo, Anybody, Grevil, hmendes, andregp, DamienMcKenna, bruno.bicudo: Show date & time when restore / backup was successful.
parent 5c47cc98

CHANGELOG.txt

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ By DamienMcKenna: Updated CHANGELOG.txt for recent 5.0.x changes already present 
  opendir(private://backup_migrate/scheduled): failed to open dir.

#3304922 by ressa, DamienMcKenna: Drupal 10: Fatal error, logger must be

  compatible with Psr\Log\AbstractLogger.

#3262070 by WagnerMelo, Anybody, Grevil, hmendes, andregp, DamienMcKenna,

  bruno.bicudo: Show date & time when restore / backup was successful.





Backup and Migrate 5.0.x-dev, xxxx-xx-xx

backup_migrate.module

+5 −1
Original line number Diff line number Diff line
@@ -61,13 +61,17 @@ function backup_migrate_perform_backup($source_id, $destination_id, array $confi 
 * @param array $config

 */

function backup_migrate_perform_restore($source_id, $destination_id, $file_id = NULL, array $config = []) {

  $time = \Drupal::time()->getCurrentTime();

  $currentTime = \Drupal::service('date.formatter')->format($time, 'long');





  try {

    // Retrieve the service.

    $bam = backup_migrate_get_service_object($config);



    // Run the backup.

    $bam->restore($source_id, $destination_id, $file_id);

    \Drupal::messenger()->addMessage(t('Restore Complete.'));

    \Drupal::messenger()->addMessage(t('Restore completed at @time', ['@time' => $currentTime]));

  }

  catch (Exception $e) {

    \Drupal::messenger()->addMessage($e->getMessage(), 'error');

tests/src/Functional/BackupMigrateQuickBackupTest.php

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ class BackupMigrateQuickBackupTest extends BrowserTestBase { 
    $session = $this->assertSession();

    $session->statusCodeEquals(200);

    $session->addressEquals('admin/config/development/backup_migrate/settings/destination/backups/private_files');

    $session->pageTextContains('Restore Complete.');

    $time = \Drupal::time()->getCurrentTime();

    $session->pageTextContains('Restore completed at ' . \Drupal::service('date.formatter')->format($time, 'long'));

  }



  /**