Merge pull request #999 from bareos/dev/fbergkemper/master/s5017

webui: optimize bvfs update cache calls
bareos · Nov 26, 2021 · eefeb8b · eefeb8b
2 parents a80a466 + f7d521e
commit eefeb8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -143,6 +143,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - docs: update documentation of config data types [PR #962]
 - Allow `release` command to be used in scripts [PR #961]
 - webui: format total jobs and total files language-sensitive [PR #996]
+- webui: optimize bvfs update cache calls [PR #999]
 
 ### Deprecated
 

diff --git a/webui/module/Restore/src/Restore/Controller/RestoreController.php b/webui/module/Restore/src/Restore/Controller/RestoreController.php
@@ -123,6 +123,7 @@ public function indexAction()
     if($this->restore_params['client'] != null) {
       try {
         $backups = $this->getClientModel()->getClientBackups($this->bsock, $this->restore_params['client'], "any", "desc", null);
+        $this->updateBvfsCache();
       }
       catch(Exception $e) {
         echo $e->getMessage();
@@ -315,6 +316,7 @@ public function versionsAction()
     if ($this->restore_params['client'] != null) {
       try {
         $backups = $this->getClientModel()->getClientBackups($this->bsock, $this->restore_params['client'], "any", "desc", null);
+        $this->updateBvfsCache();
       } catch (Exception $e) {
         echo $e->getMessage();
       }
@@ -559,10 +561,6 @@ private function buildSubtree()
     $this->setRestoreParams();
     $this->getJobIds();
 
-    if($this->restore_params['id'] === null || $this->restore_params['id'] === "#") {
-      $this->updateBvfsCache();
-    }
-
     $this->getDirectories();
     $this->getFiles();