From dea1c700626575d231d00cfd6365d6fff56b6b61 Mon Sep 17 00:00:00 2001
From: Frank Bergkemper <frank.bergkemper@bareos.com>
Date: Wed, 26 Oct 2016 11:46:24 +0200
Subject: [PATCH] Restore: fix alert msg

---
 module/Restore/src/Restore/Controller/RestoreController.php | 3 ++-
 module/Restore/view/restore/restore/index.phtml             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
index b69ed7a8..51e8252e 100644
--- a/module/Restore/src/Restore/Controller/RestoreController.php
+++ b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -139,7 +139,7 @@ public function indexAction()
          echo $e->getMessage();
       }
 
-      if($backups == null) {
+      if(empty($backups)) {
          $errors = 'No backups of client <strong>'.$this->restore_params['client'].'</strong> found.';
       }
 
@@ -204,6 +204,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
index 6e2b7f26..c2ce2949 100644
--- a/module/Restore/view/restore/restore/index.phtml
+++ b/module/Restore/view/restore/restore/index.phtml
@@ -31,7 +31,7 @@ $this->headTitle($title);
 <?php if($this->acl_alert) : echo $this->ACLAlert($this->required_commands); elseif(!$this->acl_alert) : ?>
 
 <?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>';
    }