From 2bcaa17fc3233ecf95011233be5d19b9c9b40273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Sun, 8 May 2022 21:34:03 +0200 Subject: [PATCH] gui: Add default ignores to the advanced configuration editor modal (fixes #8264) (#8265) --- gui/default/assets/lang/lang-en.json | 1 + .../syncthing/core/syncthingController.js | 6 ++++++ .../settings/advancedSettingsModalView.html | 20 +++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index 827b5e82d..a70e4f7cb 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -75,6 +75,7 @@ "Default Device": "Default Device", "Default Folder": "Default Folder", "Default Folder Path": "Default Folder Path", + "Default Ignore Patterns": "Default Ignore Patterns", "Defaults": "Defaults", "Delete": "Delete", "Delete Unexpected Items": "Delete Unexpected Items", diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index d802895a6..9c40c2123 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2860,6 +2860,12 @@ angular.module('syncthing.core') $scope.advancedConfig = angular.copy($scope.config); $scope.advancedConfig.devices.sort(deviceCompare); $scope.advancedConfig.folders.sort(folderCompare); + $scope.advancedConfig.defaults.ignores._lines = function (newValue) { + if (arguments.length) { + $scope.advancedConfig.defaults.ignores.lines = newValue.split('\n'); + } + return $scope.advancedConfig.defaults.ignores.lines.join('\n'); + }; $('#advanced').modal('show'); }; diff --git a/gui/default/syncthing/settings/advancedSettingsModalView.html b/gui/default/syncthing/settings/advancedSettingsModalView.html index 958714c5c..0f4832f6b 100644 --- a/gui/default/syncthing/settings/advancedSettingsModalView.html +++ b/gui/default/syncthing/settings/advancedSettingsModalView.html @@ -167,6 +167,26 @@ +
+ +
+
+
+ +
+
+ + + + +
+
+
+
+
+