Просмотр исходного кода

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

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4704
Simon Frei 8 лет назад
Родитель
Сommit
ae760798e1
2 измененных файлов с 1 добавлено и 5 удалено
  1. 1 1
      gui/default/index.html
  2. 0 4
      gui/default/syncthing/core/syncthingController.js

+ 1 - 1
gui/default/index.html

@@ -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)">

+ 0 - 4
gui/default/syncthing/core/syncthingController.js

@@ -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