Bladeren bron

Hide irrelevant fields for disconnected nodes (ref #592)

Jakob Borg 11 jaren geleden
bovenliggende
commit
dbbafb0cc9
3 gewijzigde bestanden met toevoegingen van 5 en 16 verwijderingen
  1. 0 0
      auto/gui.files.go
  2. 0 11
      gui/app.js
  3. 5 5
      gui/index.html

File diff suppressed because it is too large
+ 0 - 0
auto/gui.files.go


+ 0 - 11
gui/app.js

@@ -488,17 +488,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         return '';
     };
 
-    $scope.nodeVer = function (nodeCfg) {
-        if (nodeCfg.NodeID === $scope.myID) {
-            return $scope.version;
-        }
-        var conn = $scope.connections[nodeCfg.NodeID];
-        if (conn) {
-            return conn.ClientVersion;
-        }
-        return '?';
-    };
-
     $scope.findNode = function (nodeID) {
         var matches = $scope.nodes.filter(function (n) { return n.NodeID == nodeID; });
         if (matches.length != 1) {

+ 5 - 5
gui/index.html

@@ -242,7 +242,7 @@
                         <th><span class="glyphicon glyphicon-link"></span>&emsp;<span translate>Address</span></th>
                         <td class="text-right">{{nodeAddr(nodeCfg)}}</td>
                       </tr>
-                      <tr>
+                      <tr ng-if="connections[nodeCfg.NodeID]">
                         <th><span class="glyphicon glyphicon-comment"></span>&emsp;<span translate>Synchronization</span></th>
                         <td class="text-right">{{completion[nodeCfg.NodeID]._total | alwaysNumber | number:0}}%</td>
                       </tr>
@@ -251,17 +251,17 @@
                         <td translate ng-if="nodeCfg.Compression" class="text-right">Yes</td>
                         <td translate ng-if="!nodeCfg.Compression" class="text-right">No</td>
                       </tr>
-                      <tr>
+                      <tr ng-if="connections[nodeCfg.NodeID]">
                         <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
                         <td class="text-right">{{connections[nodeCfg.NodeID].inbps | metric}}bps ({{connections[nodeCfg.NodeID].InBytesTotal | binary}}B)</td>
                       </tr>
-                      <tr>
+                      <tr ng-if="connections[nodeCfg.NodeID]">
                         <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
                         <td class="text-right">{{connections[nodeCfg.NodeID].outbps | metric}}bps ({{connections[nodeCfg.NodeID].OutBytesTotal | binary}}B)</td>
                       </tr>
-                      <tr>
+                      <tr ng-if="connections[nodeCfg.NodeID]">
                         <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
-                        <td class="text-right">{{nodeVer(nodeCfg)}}</td>
+                        <td class="text-right">{{connections[nodeCfg.NodeID].ClientVersion}}</td>
                       </tr>
                       <tr ng-if="!connections[nodeCfg.NodeID]">
                         <th><span class="glyphicon glyphicon-eye-open"></span>&emsp;<span translate>Last seen</span></th>

Some files were not shown because too many files changed in this diff