From d117b4b570c0cdb54746e50af0e9a7e10d4ec2cf Mon Sep 17 00:00:00 2001 From: Simon Frei 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 07e7e2394..fbe9a4e71 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -1924,7 +1924,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 9d1f532b2..8d2325ec2 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -140,7 +140,7 @@

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.

- +

See external versioning help for supported templated command line parameters. The path cannot be blank. diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js index e72940513..0ada51f1a 100755 --- a/gui/default/untrusted/syncthing/core/syncthingController.js +++ b/gui/default/untrusted/syncthing/core/syncthingController.js @@ -1955,7 +1955,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 c8b16ca63..49d42e427 100644 --- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html +++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html @@ -128,7 +128,7 @@

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.

- +

See external versioning help for supported templated command line parameters. The path cannot be blank.