octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Add new folder state "Failed Items" (fixes #5456) (#5614)

Browse Source
This commit is contained in:
Simon Frei 2019-03-22 18:57:53 +01:00 committed by Audrius Butkevicius
parent e7ae851900
commit 675f289aef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/default/index.html
View File

@ -328,6 +328,7 @@
<span ng-show="syncRemaining(folder.id)">({{syncPercentage(folder.id) | percent}}, {{syncRemaining(folder.id) | binary}}B)</span> <span ng-show="syncRemaining(folder.id)">({{syncPercentage(folder.id) | percent}}, {{syncRemaining(folder.id) | binary}}B)</span>
</span> </span>
<span ng-switch-when="outofsync"><span class="hidden-xs" translate>Out of Sync</span><span class="visible-xs" aria-label="{{'Out of Sync' | translate}}"><i class="fas fa-fw fa-exclamation-circle"></i></span></span> <span ng-switch-when="outofsync"><span class="hidden-xs" translate>Out of Sync</span><span class="visible-xs" aria-label="{{'Out of Sync' | translate}}"><i class="fas fa-fw fa-exclamation-circle"></i></span></span>
<span ng-switch-when="faileditems"><span class="hidden-xs" translate>Failed Items</span><span class="visible-xs" aria-label="{{'Failed Items' | translate}}"><i class="fas fa-fw fa-exclamation-circle"></i></span></span>
</div> </div>
<div class="panel-title-text"> <div class="panel-title-text">
<span tooltip data-original-title="{{folder.label.length != 0 ? folder.id : ''}}">{{folder.label.length != 0 ? folder.label : folder.id}}</span> <span tooltip data-original-title="{{folder.label.length != 0 ? folder.id : ''}}">{{folder.label.length != 0 ? folder.label : folder.id}}</span>

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

@ -751,6 +751,9 @@ angular.module('syncthing.core')
if (state === 'idle' && $scope.model[folderCfg.id].needTotalItems > 0) { if (state === 'idle' && $scope.model[folderCfg.id].needTotalItems > 0) {
return 'outofsync'; return 'outofsync';
} }
if ($scope.hasFailedFiles(folderCfg.id)) {
return 'faileditems';
}
if (state === 'scanning') { if (state === 'scanning') {
return state; return state;
} }
@ -777,7 +780,7 @@ angular.module('syncthing.core')
if (status === 'unknown') { if (status === 'unknown') {
return 'info'; return 'info';
} }
if (status === 'stopped' || status === 'outofsync' || status === 'error') { if (status === 'stopped' || status === 'outofsync' || status === 'error' || status === 'faileditems') {
return 'danger'; return 'danger';
} }
if (status === 'unshared' || status === 'scan-waiting') { if (status === 'unshared' || status === 'scan-waiting') {