From 6152eb6d6d6becb99ccc594974a800adb88b844e Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Mon, 17 Oct 2016 13:35:30 +0200
Subject: [PATCH] gui: Hide "Failed Items" unless there is an actual failure
 (fixes #3647)

Since delta indexes it's perfectly normal for us to need files that are
currently unavailable due to devices being disconnected. This doesn't
imply a failure, so we should not show the "Failed Items" line and
corresponding eternal spinner (since it would never be filled in, since
there is no failure).

We still show state "Out of Sync" (correct) and the list of files we
need (correct).
---
 gui/default/index.html | 8 ++------
 test/h1/config.xml     | 2 +-
 test/h2/config.xml     | 6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gui/default/index.html b/gui/default/index.html
index da26c93f1..47c8810d0 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -337,16 +337,12 @@
                         <span tooltip data-original-title="{{scanRate(folder.id) | binary}}B/s">~ {{scanRemaining(folder.id)}}</span>
                       </td>
                     </tr>
-                    <tr ng-if="folder.type != 'readonly' && (folderStatus(folder) === 'outofsync' || hasFailedFiles(folder.id))">
+                    <tr ng-if="hasFailedFiles(folder.id))">
                       <th><span class="fa fa-fw fa-exclamation-circle"></span>&nbsp;<span translate>Failed Items</span></th>
                       <!-- Show the number of failed items as a link to bring up the list. -->
-                      <td ng-if="hasFailedFiles(folder.id)" class="text-right">
+                      <td class="text-right">
                         <a href="" ng-click="showFailed(folder.id)">{{failed[folder.id].length | alwaysNumber}}&nbsp;<span translate>items</span></a>
                       </td>
-                      <!-- The list of failed items hasn't loaded yet; show a spinner for the time being. -->
-                      <td ng-if="!hasFailedFiles(folder.id)" class="text-right">
-                        <span class="fa fa-spinner fa-pulse"></span>
-                      </td>
                     </tr>
                     <tr ng-if="folder.type != 'readwrite'">
                       <th><span class="fa fa-fw fa-lock"></span>&nbsp;<span translate>Folder Type</span></th>
diff --git a/test/h1/config.xml b/test/h1/config.xml
index 9a8f46661..f221cb186 100644
--- a/test/h1/config.xml
+++ b/test/h1/config.xml
@@ -1,4 +1,4 @@
-<configuration version="15">
+<configuration version="16">
     <folder id="default" label="" path="s1/" type="readwrite" rescanIntervalS="10" ignorePerms="false" autoNormalize="true">
         <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
         <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC"></device>
diff --git a/test/h2/config.xml b/test/h2/config.xml
index 9702453f7..1b79edf74 100644
--- a/test/h2/config.xml
+++ b/test/h2/config.xml
@@ -1,4 +1,4 @@
-<configuration version="15">
+<configuration version="16">
     <folder id="default" label="" path="s2/" type="readwrite" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
         <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
         <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC"></device>
@@ -75,7 +75,7 @@
         <localAnnounceEnabled>true</localAnnounceEnabled>
         <localAnnouncePort>21027</localAnnouncePort>
         <localAnnounceMCAddr>[ff12::8384]:21027</localAnnounceMCAddr>
-        <maxSendKbps>0</maxSendKbps>
+        <maxSendKbps>10</maxSendKbps>
         <maxRecvKbps>0</maxRecvKbps>
         <reconnectionIntervalS>5</reconnectionIntervalS>
         <relaysEnabled>true</relaysEnabled>
@@ -96,7 +96,7 @@
         <cacheIgnoredFiles>false</cacheIgnoredFiles>
         <progressUpdateIntervalS>5</progressUpdateIntervalS>
         <symlinksEnabled>true</symlinksEnabled>
-        <limitBandwidthInLan>false</limitBandwidthInLan>
+        <limitBandwidthInLan>true</limitBandwidthInLan>
         <minHomeDiskFreePct>1</minHomeDiskFreePct>
         <releasesURL>https://upgrades.syncthing.net/meta.json</releasesURL>
         <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>