perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: Disable device removal when we know it will be reintroduced

Browse Source 
Skip-check: pr-build-windows

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3762
This commit is contained in:
Audrius Butkevicius
2016-12-02 21:07:02 +00:00
committed by Jakob Borg
parent 2fd1dca905
commit 99922feb3b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1071,6 +1071,13 @@ angular.module('syncthing.core')
$scope.editDevice = function (deviceCfg) {
$scope.currentDevice = $.extend({}, deviceCfg);
$scope.editingExisting = true;
$scope.willBeReintroducedBy = undefined;
if (deviceCfg.introducedBy) {
var introducerDevice = $scope.findDevice(deviceCfg.introducedBy);
if (introducerDevice && introducerDevice.introducer) {
$scope.willBeReintroducedBy = $scope.deviceName(introducerDevice);
}
}
$scope.currentDevice._addressesStr = deviceCfg.addresses.join(', ');
$scope.currentDevice.selectedFolders = {};
$scope.deviceFolders($scope.currentDevice).forEach(function (folder) {