summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frei <freisim93@gmail.com>2020-11-11 18:18:34 +0100
committerJakob Borg <jakob@kastelo.net>2020-11-11 18:18:52 +0100
commit35c813f56fb80ea23f3051b77c5a5ce20527b52c (patch)
treed4fbd5bd1cc7e2d3f844ac3d26e06028e7db9a13
parent846b2654300510f29805b146054685682d0c48f1 (diff)
gui: Initialise sharing when accepting new device (fixes #7113) (#7114)v1.12.0-rc.2
-rwxr-xr-xgui/default/syncthing/core/syncthingController.js1
-rwxr-xr-xgui/default/untrusted/syncthing/core/syncthingController.js1
2 files changed, 2 insertions, 0 deletions
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index c03b4d04e..1238e0e4c 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -1455,6 +1455,7 @@ angular.module('syncthing.core')
ignoredFolders: []
};
$scope.editingExisting = false;
+ initShareEditing('device');
$scope.deviceEditor.$setPristine();
$('#editDevice').modal();
});
diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js
index 8ab91d0b9..fcff0e802 100755
--- a/gui/default/untrusted/syncthing/core/syncthingController.js
+++ b/gui/default/untrusted/syncthing/core/syncthingController.js
@@ -1475,6 +1475,7 @@ angular.module('syncthing.core')
ignoredFolders: []
};
$scope.editingExisting = false;
+ initShareEditing('device');
$scope.deviceEditor.$setPristine();
$('#editDevice').modal();
});