From edaff81c0a4b4992df209b0aa0daa73a60b53ca0 Mon Sep 17 00:00:00 2001
From: tomasz1986 <twilczynski@naver.com>
Date: Sat, 20 Feb 2021 01:49:56 +0900
Subject: [PATCH] gui: Remove cleanupIntervalS leftovers from External
 Versioning (ref #7360) (#7378)

---
 gui/default/syncthing/core/syncthingController.js               | 1 -
 gui/default/untrusted/syncthing/core/syncthingController.js     | 1 -
 gui/default/untrusted/syncthing/folder/editFolderModalView.html | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 4fd6fb723..95850b3ff 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -2077,7 +2077,6 @@ angular.module('syncthing.core')
                     'params': {
                         'command': '' + folderCfg._guiVersioning.externalCommand
                     },
-                    'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS
                 };
                 break;
             default:
diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js
index 335d96f50..b299c07bb 100755
--- a/gui/default/untrusted/syncthing/core/syncthingController.js
+++ b/gui/default/untrusted/syncthing/core/syncthingController.js
@@ -2096,7 +2096,6 @@ angular.module('syncthing.core')
                     'params': {
                         'command': '' + folderCfg._guiVersioning.externalCommand
                     },
-                    'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS
                 };
                 break;
             default:
diff --git a/gui/default/untrusted/syncthing/folder/editFolderModalView.html b/gui/default/untrusted/syncthing/folder/editFolderModalView.html
index 5e299e592..bd1ecb188 100644
--- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html
+++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html
@@ -134,7 +134,7 @@
               <span translate ng-if="folderEditor.externalCommand.$error.required && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>
             </p>
           </div>
-          <div class="form-group" ng-if="currentFolder._guiVersioning.selector != 'none'" ng-class="{'has-error': folderEditor._guiVersioning.cleanupIntervalS.$invalid && folderEditor._guiVersioning.cleanupIntervalS.$dirty}">
+          <div class="form-group" ng-if="currentFolder._guiVersioning.selector != 'none' && currentFolder._guiVersioning.selector != 'external'" ng-class="{'has-error': folderEditor._guiVersioning.cleanupIntervalS.$invalid && folderEditor._guiVersioning.cleanupIntervalS.$dirty}">
             <label translate for="versioningCleanupIntervalS">Cleanup Interval</label>
             <div class="input-group">
               <input name="versioningCleanupIntervalS" id="versioningCleanupIntervalS" class="form-control text-right" type="number" ng-model="currentFolder._guiVersioning.cleanupIntervalS" required="" min="0" max="31536000" aria-required="true" />