From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 28 Apr 2019 13:32:50 +0000 (+0200)
Subject: baculum: Fix updating whole Bacula config at once
X-Git-Tag: Release-9.4.3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39cc19748b958c357680256e5e499ac837cd2dd4;p=thirdparty%2Fbacula.git

baculum: Fix updating whole Bacula config at once
---

diff --git a/gui/baculum/protected/API/Class/BaculaSetting.php b/gui/baculum/protected/API/Class/BaculaSetting.php
index 95911d1a6..26d8a55ea 100644
--- a/gui/baculum/protected/API/Class/BaculaSetting.php
+++ b/gui/baculum/protected/API/Class/BaculaSetting.php
@@ -187,12 +187,16 @@ class BaculaSetting extends APIModule {
 		if (!is_null($resource_type) && !is_null($resource_name)) {
 			// Update single resource in config
 			$config = $this->updateConfigResource($config_orig, $config_new, $resource_type, $resource_name);
-		} elseif (count($config_orig) > 0) {
+		} elseif (count($config_orig) > 0 && !is_null($resource_type)) {
 			// Update whole config
 			$config = $this->updateConfig($config_orig, $config_new);
 		} elseif (count($config_new) > 0) {
 			// Add new config (create component config)
 			$config = $config_new;
+			for ($i = 0; $i < count($config); $i++) {
+				// update resource for formatting values
+				$config[$i] = $this->updateResource($config[$i], $config[$i]);
+			}
 		}
 
 		// Save config to file