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

gui, lib/config, lib/model: Add ability to ignore folders offered by other nodes (fixes #3993)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4179
LGTM: AudriusButkevicius, calmh
This commit is contained in:
nrm21
2017-05-31 18:04:00 +00:00
committed by Jakob Borg
parent 3959eb26fb
commit b49bbe82dd
6 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/default/index.html
View File

@@ -216,6 +216,9 @@
<button type="button" class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
<span class="fa fa-clock-o"></span>&nbsp;<span translate>Later</span>
</button>
<button type="button" class="btn btn-sm btn-default" ng-click="ignoreRejectedFolder(event.data.folder, event.data.device)">
<span class="fa fa-times"></span>&nbsp;<span translate>Ignore</span>
</button>
</div>
</div>
</div>

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

@@ -1532,6 +1532,12 @@ angular.module('syncthing.core')
delete $scope.folderRejections[folder + "-" + device];
};
$scope.ignoreRejectedFolder = function (folder, device) {
$scope.config.ignoredFolders.push(folder);
$scope.saveConfig();
$scope.dismissFolderRejection(folder, device);
};
$scope.sharesFolder = function (folderCfg) {
var names = [];
folderCfg.devices.forEach(function (device) {