]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix updating whole Bacula config at once
authorMarcin Haba <marcin.haba@bacula.pl>
Sun, 28 Apr 2019 13:32:50 +0000 (15:32 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Sun, 28 Apr 2019 14:58:31 +0000 (16:58 +0200)
gui/baculum/protected/API/Class/BaculaSetting.php

index 95911d1a61cdc62fdb08b2b532651790259af170..26d8a55ea6c587432cb29051592c180364c57c1d 100644 (file)
@@ -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