octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-08 22:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Prioritize non-idle folder states (fixes #6169) (#6170)

Browse Source
This commit is contained in:
Simon Frei 2019-11-20 19:06:03 +01:00 committed by Jakob Borg
parent 80eac473d9
commit 552ea68672
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,20 +799,20 @@ angular.module('syncthing.core')
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
} }
if (state === 'idle' && folderInfo.needTotalItems > 0) {
if (state !== 'idle') {
return state;
}
if (folderInfo.needTotalItems > 0) {
return 'outofsync'; return 'outofsync';
} }
if ($scope.hasFailedFiles(folderCfg.id)) { if ($scope.hasFailedFiles(folderCfg.id)) {
return 'faileditems'; return 'faileditems';
} }
if (state === 'scanning') {
return state;
}
if (folderInfo.receiveOnlyTotalItems) { if (folderInfo.receiveOnlyTotalItems) {
return 'localadditions'; return 'localadditions';
} }
if (folderCfg.devices.length <= 1) { if (folderCfg.devices.length <= 1) {
return 'unshared'; return 'unshared';
} }