From 82f190285a02510600cbb7eeb2674e43f18e9173 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Sun, 14 Feb 2021 09:54:49 +0100
Subject: [PATCH] gui: Fix setting external versioning command (fixes #7361)
 (#7362)

---
 gui/default/syncthing/core/syncthingController.js               | 2 +-
 gui/default/syncthing/folder/editFolderModalView.html           | 2 +-
 gui/default/untrusted/syncthing/core/syncthingController.js     | 2 +-
 gui/default/untrusted/syncthing/folder/editFolderModalView.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 7dbd09a1e..135d6dcc5 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -1916,7 +1916,7 @@ angular.module('syncthing.core')
                 break;
             case "external":
                 $scope.currentFolder._guiVersioning.selector = "external";
-                $scope.currentFolder.externalCommand = currentVersioning.params.command;
+                $scope.currentFolder._guiVersioning.externalCommand = currentVersioning.params.command;
                 break;
             }
         };
diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html
index 3ed21392b..560574fd9 100644
--- a/gui/default/syncthing/folder/editFolderModalView.html
+++ b/gui/default/syncthing/folder/editFolderModalView.html
@@ -140,7 +140,7 @@
           <div class="form-group" ng-if="currentFolder._guiVersioning.selector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
             <p translate class="help-block">An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.</p>
             <label translate for="externalCommand">Command</label>
-            <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required="" aria-required="true" />
+            <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder._guiVersioning.externalCommand" required="" aria-required="true" />
             <p class="help-block">
               <span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">See external versioning help for supported templated command line parameters.</span>
               <span translate ng-if="folderEditor.externalCommand.$error.required && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>
diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js
index cf1756602..1f57e5db9 100755
--- a/gui/default/untrusted/syncthing/core/syncthingController.js
+++ b/gui/default/untrusted/syncthing/core/syncthingController.js
@@ -1933,7 +1933,7 @@ angular.module('syncthing.core')
                 break;
             case "external":
                 $scope.currentFolder._guiVersioning.selector = "external";
-                $scope.currentFolder.externalCommand = currentVersioning.params.command;
+                $scope.currentFolder._guiVersioning.externalCommand = currentVersioning.params.command;
                 break;
             }
         };
diff --git a/gui/default/untrusted/syncthing/folder/editFolderModalView.html b/gui/default/untrusted/syncthing/folder/editFolderModalView.html
index 1aca62c8e..440171d78 100644
--- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html
+++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html
@@ -128,7 +128,7 @@
           <div class="form-group" ng-if="currentFolder._guiVersioning.selector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
             <p translate class="help-block">An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.</p>
             <label translate for="externalCommand">Command</label>
-            <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required="" aria-required="true" />
+            <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder._guiVersioning.externalCommand" required="" aria-required="true" />
             <p class="help-block">
               <span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">See external versioning help for supported templated command line parameters.</span>
               <span translate ng-if="folderEditor.externalCommand.$error.required && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>