Преглед на файлове

gui: Do not replace zero versioning cleanup interval (#7234)

Simon Frei преди 4 години
родител
ревизия
5440d1dc3b
променени са 2 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 4 1
      gui/default/syncthing/core/syncthingController.js
  2. 4 1
      gui/default/untrusted/syncthing/core/syncthingController.js

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

@@ -1812,7 +1812,10 @@ angular.module('syncthing.core')
             $scope.currentFolder.simpleKeep = $scope.currentFolder.simpleKeep || 5;
             $scope.currentFolder.staggeredCleanInterval = $scope.currentFolder.staggeredCleanInterval || 3600;
             $scope.currentFolder.staggeredVersionsPath = $scope.currentFolder.staggeredVersionsPath || "";
-            $scope.currentFolder.versioningCleanupIntervalS = $scope.currentFolder.versioningCleanupIntervalS || 3600;
+            // Zero is a valid, non-default value (disabled)
+            if ($scope.currentFolder.versioningCleanupIntervalS !== 0) {
+                $scope.currentFolder.versioningCleanupIntervalS = $scope.currentFolder.versioningCleanupIntervalS || 3600;
+            }
 
             // staggeredMaxAge can validly be zero, which we should not replace
             // with the default value of 365. So only set the default if it's

+ 4 - 1
gui/default/untrusted/syncthing/core/syncthingController.js

@@ -1829,7 +1829,10 @@ angular.module('syncthing.core')
             $scope.currentFolder.simpleKeep = $scope.currentFolder.simpleKeep || 5;
             $scope.currentFolder.staggeredCleanInterval = $scope.currentFolder.staggeredCleanInterval || 3600;
             $scope.currentFolder.staggeredVersionsPath = $scope.currentFolder.staggeredVersionsPath || "";
-            $scope.currentFolder.versioningCleanupIntervalS = $scope.currentFolder.versioningCleanupIntervalS || 3600;
+            // Zero is a valid, non-default value (disabled)
+            if ($scope.currentFolder.versioningCleanupIntervalS !== 0) {
+                $scope.currentFolder.versioningCleanupIntervalS = $scope.currentFolder.versioningCleanupIntervalS || 3600;
+            }
 
             // staggeredMaxAge can validly be zero, which we should not replace
             // with the default value of 365. So only set the default if it's