From 793edd77d90ffff2502ec1dc9f4d0c3442ebb94c Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 11 Feb 2019 02:53:18 +0000
Subject: [PATCH] BorgVersion improved (annoying output to config file fixed).

---
 borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx b/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
index eff23c4..014ec80 100644
--- a/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
+++ b/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
@@ -35,9 +35,9 @@
             .then((data) => {
                 this.setState({
                     loading: false,
+                    borgVersion: data.borgVersion,
                     borgBinary: data.borgVersion.borgBinary,
-                    borgCommand: data.borgVersion.borgCommand,
-                    ...data
+                    ...data.serverConfiguration
                 })
             })
             .catch((error) => {
@@ -84,12 +84,14 @@
 
     save() {
         var config = {
-            port: this.state.port,
-            maxArchiveContentCacheCapacityMb: this.state.maxArchiveContentCacheCapacityMb,
-            webDevelopmentMode: this.state.webDevelopmentMode,
-            showDemoRepos: this.state.showDemoRepos,
+            serverConfiguration: {
+                port: this.state.port,
+                maxArchiveContentCacheCapacityMb: this.state.maxArchiveContentCacheCapacityMb,
+                webDevelopmentMode: this.state.webDevelopmentMode,
+                showDemoRepos: this.state.showDemoRepos,
+                borgCommand: this.state.borgCommand
+            },
             borgVersion: {
-                borgCommand: this.state.borgCommand,
                 borgBinary: this.state.borgBinary
             }
         };

--
Gitblit v1.10.0