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

Correctly set and clear errors for missing folders (fixes #1937)

Browse Source
This commit is contained in:
Audrius Butkevicius
2015-06-13 19:10:11 +01:00
parent 7f56d5c23a
commit 1d856b4723
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/index.html
View File

@@ -287,7 +287,7 @@
<div class="panel-footer">
<button class="btn btn-sm btn-danger pull-left" ng-if="folderStatus(folder) == 'idle' && folder.readOnly && model[folder.id].needFiles > 0" ng-click="override(folder.id)" href=""><span class="glyphicon glyphicon-upload"></span>&nbsp;<span translate>Override Changes</span></button>
<span class="pull-right">
<button class="btn btn-sm btn-default" href="" ng-show="folderStatus(folder) == 'idle'" ng-click="rescanFolder(folder.id)"><span class="glyphicon glyphicon-refresh"></span>&nbsp;<span translate>Rescan</span></button>
<button class="btn btn-sm btn-default" href="" ng-show="['idle', 'stopped'].indexOf(folderStatus(folder)) > -1" ng-click="rescanFolder(folder.id)"><span class="glyphicon glyphicon-refresh"></span>&nbsp;<span translate>Rescan</span></button>
<button class="btn btn-sm btn-default" href="" ng-click="editFolder(folder)"><span class="glyphicon glyphicon-pencil"></span>&nbsp;<span translate>Edit</span></button>
</span>
<div class="clearfix"></div>

1
gui/scripts/syncthing/core/controllers/syncthingController.js
View File

@@ -140,6 +140,7 @@ angular.module('syncthing.core')
var data = arg.data;
if ($scope.model[data.folder]) {
$scope.model[data.folder].state = data.to;
$scope.model[data.folder].error = data.error;
}
});