Restore: fix alert msg

bareos · Oct 25, 2016 · aee38de · aee38de
1 parent bc7d6a4
commit aee38de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -80,7 +80,7 @@ public function indexAction()
          $filesets = $this->getRestoreModel()->getFilesets();
          $restorejobs = $this->getRestoreModel()->getRestoreJobs();
 
-         if($backups == null) {
+         if(empty($backups)) {
             $errors = 'No backups of client <strong>'.$this->restore_params['client'].'</strong> found.';
          }
 
@@ -135,6 +135,7 @@ public function indexAction()
                return new ViewModel(array(
                   'restore_params' => $this->restore_params,
                   'form' => $form,
+                  'errors' => $errors
                ));
             }
 

diff --git a/module/Restore/view/restore/restore/index.phtml b/module/Restore/view/restore/restore/index.phtml
@@ -29,7 +29,7 @@ $this->headTitle($title);
 ?>
 
 <?php
-   if(isset($this->errors)) {
+   if(isset($this->errors) && !empty($this->errors)) {
       echo '<div class="alert alert-danger" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
   <strong>Error: </strong>'.$this->errors.'</div>';
    }