Merge pull request #2004 from slntopp/dev-fixes

fix disable all switch
slntopp · Feb 12, 2025 · e53efaa · e53efaa
2 parents 23c7f1d + 31226bf
commit e53efaa
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/admin-ui/src/components/ServicesProvider/suspend-rules.vue b/admin-ui/src/components/ServicesProvider/suspend-rules.vue
@@ -109,12 +109,16 @@ function isTime(value) {
 
 const setTemplateRules = () => {
   template.value.suspendRules.schedules.map((shedule) => {
-    suspendRules.value[shedule.day] = shedule.allowedSuspendTime.map(
-      (range) => ({
-        startTime: range.startTime,
-        endTime: range.endTime,
-      })
-    );
+    if (shedule.enabled) {
+      suspendRules.value[shedule.day] = null;
+    } else {
+      suspendRules.value[shedule.day] = shedule.allowedSuspendTime.map(
+        (range) => ({
+          startTime: range.startTime,
+          endTime: range.endTime,
+        })
+      );
+    }
   });
 
   suspendRules.value = { ...suspendRules.value };
@@ -164,6 +168,7 @@ const save = async () => {
       newSuspendRules.schedules.push({
         day,
         allowedSuspendTime: suspendRules.value[day],
+        enabled: suspendRules.value[day] !== null,
       });
     });