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

gui: Count deleted items for remote out of sync items display (fixes #4668)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4669
LGTM: calmh, AudriusButkevicius
This commit is contained in:
Simon Frei
2018-01-14 12:08:40 +00:00
committed by Audrius Butkevicius
parent 916ec63af6
commit f1c73999be
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -495,7 +495,7 @@ angular.module('syncthing.core')
} else {
$scope.completion[device]._total = Math.floor(100 * (1 - needed / total));
$scope.completion[device]._needBytes = needed
$scope.completion[device]._needItems = items;
$scope.completion[device]._needItems = items + deletes;
}
if (needed == 0 && deletes > 0) {
@@ -2054,7 +2054,8 @@ angular.module('syncthing.core')
resetRemoteNeed();
$scope.remoteNeedDevice = device;
$scope.deviceFolders(device).forEach(function(folder) {
if ($scope.completion[device.deviceID][folder] !== undefined && $scope.completion[device.deviceID][folder].needItems === 0) {
var comp = $scope.completion[device.deviceID][folder];
if (comp !== undefined && comp.needItems + comp.needDeletes === 0) {
return;
}
$scope.remoteNeedFolders.push(folder);