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

gui: Fix missing sharing device when adding pending folder (#7227)

Browse Source
This commit is contained in:
André Colomb 2020-12-22 22:37:29 +01:00 committed by GitHub
parent 1555a4da7f
commit 07618f8674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1781,7 +1781,7 @@ angular.module('syncthing.core')
$scope.currentSharing.selected[n.deviceID] = true; $scope.currentSharing.selected[n.deviceID] = true;
}); });
$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];
}); });
if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") { if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") {
$scope.currentFolder.trashcanFileVersioning = true; $scope.currentFolder.trashcanFileVersioning = true;
@ -1879,7 +1879,7 @@ angular.module('syncthing.core')
initShareEditing('folder'); initShareEditing('folder');
$scope.currentSharing.selected[device] = true; $scope.currentSharing.selected[device] = true;
$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.ignores.text = ''; $scope.ignores.text = '';
$scope.ignores.error = null; $scope.ignores.error = null;

4
gui/default/untrusted/syncthing/core/syncthingController.js
View File

@ -1798,7 +1798,7 @@ angular.module('syncthing.core')
$scope.currentSharing.selected[n.deviceID] = true; $scope.currentSharing.selected[n.deviceID] = true;
}); });
$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];
}); });
if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") { if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") {
$scope.currentFolder.trashcanFileVersioning = true; $scope.currentFolder.trashcanFileVersioning = true;
@ -1896,7 +1896,7 @@ angular.module('syncthing.core')
initShareEditing('folder'); initShareEditing('folder');
$scope.currentSharing.selected[device] = true; $scope.currentSharing.selected[device] = true;
$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.ignores.text = ''; $scope.ignores.text = '';
$scope.ignores.error = null; $scope.ignores.error = null;