octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 07:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Sort already shared devices in edit folder modal (fixes #7940) (#7945)

Browse Source 
The list of unshared devices is built from deviceList(), which sorts
the result.  But the shared devices are listed in undefined order from
the unsorted currentFolder.devices array.  Apply the same sorting
after building the array used in the dialog.
This commit is contained in:
André Colomb 2021-09-13 20:41:15 +02:00 committed by GitHub
parent 721cd740d8
commit a5792f3c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,6 +799,7 @@ angular.module('syncthing.core')
} }
$scope.currentSharing.selected[n.deviceID] = true; $scope.currentSharing.selected[n.deviceID] = true;
}); });
$scope.currentSharing.shared.sort(deviceCompare);
$scope.currentSharing.unrelated = $scope.deviceList().filter(function (n) { $scope.currentSharing.unrelated = $scope.deviceList().filter(function (n) {
return n.deviceID !== $scope.myID && !$scope.currentSharing.selected[n.deviceID]; return n.deviceID !== $scope.myID && !$scope.currentSharing.selected[n.deviceID];
}); });