octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Preserve folder-device info on folder edit (fixes #6706) (#6707)

Browse Source
This commit is contained in:
Simon Frei 2020-06-02 23:05:19 +02:00 committed by GitHub
parent 9ef17322be
commit 79bf1f1056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/default/syncthing/core/syncthingController.js
View File

@ -59,6 +59,7 @@ angular.module('syncthing.core')
} catch (exception) { } } catch (exception) { }
$scope.folderDefaults = { $scope.folderDefaults = {
devices: [],
sharedDevices: {}, sharedDevices: {},
selectedDevices: {}, selectedDevices: {},
unrelatedDevices: {}, unrelatedDevices: {},
@ -1833,15 +1834,22 @@ angular.module('syncthing.core')
$scope.saveFolder = function () { $scope.saveFolder = function () {
$('#editFolder').modal('hide'); $('#editFolder').modal('hide');
var folderCfg = angular.copy($scope.currentFolder); var folderCfg = angular.copy($scope.currentFolder);
folderCfg.devices = [];
folderCfg.selectedDevices[$scope.myID] = true; folderCfg.selectedDevices[$scope.myID] = true;
var newDevices = [];
folderCfg.devices.forEach(function (dev) {
if (folderCfg.selectedDevices[dev.deviceID] === true) {
newDevices.push(dev);
delete folderCfg.selectedDevices[dev.deviceID];
};
});
for (var deviceID in folderCfg.selectedDevices) { for (var deviceID in folderCfg.selectedDevices) {
if (folderCfg.selectedDevices[deviceID] === true) { if (folderCfg.selectedDevices[deviceID] === true) {
folderCfg.devices.push({ newDevices.push({
deviceID: deviceID deviceID: deviceID
}); });
} }
} }
folderCfg.devices = newDevices;
delete folderCfg.sharedDevices; delete folderCfg.sharedDevices;
delete folderCfg.selectedDevices; delete folderCfg.selectedDevices;
delete folderCfg.unrelatedDevices; delete folderCfg.unrelatedDevices;