Update timezone handling in Settings.vue

NethServer · Jan 12, 2024 · a0ea91b · a0ea91b
1 parent df8e79c
commit a0ea91b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -430,7 +430,7 @@ export default {
         mail_module: "",
         ejabberd_module: "",
         locale: "",
-        timezone: "",
+        accepted_timezone_list: "",
         limit_min: "",
         limit_max: "",
         webapp: {
@@ -599,7 +599,7 @@ export default {
         } else {
           this.ejabberd_module = "-";
         }
-        this.timezone = config.timezone;
+        this.timezone = config.timezone === '-' ? '' : config.timezone;
       });
       this.loading.getConfiguration = false;
       this.focusElement("hostname");
@@ -624,6 +624,14 @@ export default {
         }
         isValidationOk = false;
       }
+      if (!this.timezone) {
+        this.error.accepted_timezone_list = "common.required";
+
+        if (isValidationOk) {
+          this.focusElement("accepted_timezone_list");
+        }
+        isValidationOk = false;
+      }
 
       if (parseInt(this.webapp.min_memory) > parseInt(this.webapp.max_memory)) {
         this.error.limit_min = "error.choose_min_webapp_memory_MB";