octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-03-21 10:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Display rescan button when out of sync and remove deprecated folder state

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4704
This commit is contained in:
Simon Frei 2018-01-27 09:10:11 +00:00 committed by Jakob Borg
parent 364f61bda6
commit ae760798e1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/default/index.html
View File

@ -439,7 +439,7 @@
<button type="button" class="btn btn-default btn-sm" ng-click="restoreVersions.show(folder.id)" ng-if="folder.versioning.type"> <button type="button" class="btn btn-default btn-sm" ng-click="restoreVersions.show(folder.id)" ng-if="folder.versioning.type">
<span class="fa fa-undo"></span>&nbsp;<span translate>Versions</span> <span class="fa fa-undo"></span>&nbsp;<span translate>Versions</span>
</button> </button>
<button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-show="['idle', 'stopped', 'unshared'].indexOf(folderStatus(folder)) > -1"> <button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-show="['idle', 'stopped', 'unshared', 'outofsync'].indexOf(folderStatus(folder)) > -1">
<span class="fa fa-refresh"></span>&nbsp;<span translate>Rescan</span> <span class="fa fa-refresh"></span>&nbsp;<span translate>Rescan</span>
</button> </button>
<button type="button" class="btn btn-sm btn-default" ng-click="editFolder(folder)"> <button type="button" class="btn btn-sm btn-default" ng-click="editFolder(folder)">

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

@ -731,10 +731,6 @@ angular.module('syncthing.core')
return 'unknown'; return 'unknown';
} }
if ($scope.model[folderCfg.id].invalid) {
return 'stopped';
}
var state = '' + $scope.model[folderCfg.id].state; var state = '' + $scope.model[folderCfg.id].state;
if (state === 'error') { if (state === 'error') {
return 'stopped'; // legacy, the state is called "stopped" in the GUI return 'stopped'; // legacy, the state is called "stopped" in the GUI