fix set repo history validation (#7563)

haiwen · Mar 5, 2025 · df4e04d · df4e04d
1 parent a8727ae
commit df4e04d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/frontend/src/components/dialog/lib-settings/lib-history-setting-panel.js b/frontend/src/components/dialog/lib-settings/lib-history-setting-panel.js
@@ -48,21 +48,25 @@ class LibHistorySetting extends React.Component {
       days = this.state.expireDays;
     }
     let repoID = this.props.repoID;
-    if (Number(days) > 0) {
-      let message = gettext('Successfully set library history.');
-      seafileAPI.setRepoHistoryLimit(repoID, parseInt(days)).then(res => {
-        toaster.success(message);
-        this.setState({ keepDays: res.data.keep_days });
-        this.props.toggleDialog();
-      }).catch(error => {
-        let errMessage = Utils.getErrorMsg(error);
-        toaster.danger(errMessage);
-      });
-    } else {
+    // If it's allHistory, days is always -1, no validation is needed;
+    // If it's noHistory, days is always 0, no validation is needed;
+    // If it's autoHistory, days needs to be validated to be greater than 0."
+    if (this.state.autoHistory && Number(days) <= 0) {
       this.setState({
         errorInfo: gettext('Please enter a non-negative integer'),
       });
+      return;
     }
+
+    let message = gettext('Successfully set library history.');
+    seafileAPI.setRepoHistoryLimit(repoID, parseInt(days)).then(res => {
+      toaster.success(message);
+      this.setState({ keepDays: res.data.keep_days });
+      this.props.toggleDialog();
+    }).catch(error => {
+      let errMessage = Utils.getErrorMsg(error);
+      toaster.danger(errMessage);
+    });
   };
 
   handleKeyDown = (e) => {

diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js
@@ -50,21 +50,25 @@ class SysAdminLibHistorySettingDialog extends React.Component {
       days = this.state.expireDays;
     }
     let repoID = this.props.repoID;
-    if (Number(days) > 0) {
-      let message = gettext('Successfully set library history.');
-      systemAdminAPI.sysAdminUpdateRepoHistorySetting(repoID, parseInt(days)).then(res => {
-        toaster.success(message);
-        this.setState({ keepDays: res.data.keep_days });
-        this.props.toggleDialog();
-      }).catch(error => {
-        let errMessage = Utils.getErrorMsg(error);
-        toaster.danger(errMessage);
-      });
-    } else {
+    // If it's allHistory, days is always -1, no validation is needed;
+    // If it's noHistory, days is always 0, no validation is needed;
+    // If it's autoHistory, days needs to be validated to be greater than 0."
+    if (this.state.autoHistory && Number(days) <= 0) {
       this.setState({
         errorInfo: gettext('Please enter a non-negative integer'),
       });
+      return;
     }
+
+    let message = gettext('Successfully set library history.');
+    systemAdminAPI.sysAdminUpdateRepoHistorySetting(repoID, parseInt(days)).then(res => {
+      toaster.success(message);
+      this.setState({ keepDays: res.data.keep_days });
+      this.props.toggleDialog();
+    }).catch(error => {
+      let errMessage = Utils.getErrorMsg(error);
+      toaster.danger(errMessage);
+    });
   };
 
   handleKeyDown = (e) => {