UI. use the mail_domain in the NSComboBox

NethServer · Aug 9, 2023 · a43ac3e · a43ac3e
1 parent a9c7de5
commit a43ac3e
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -372,6 +372,7 @@ export default {
       hostname: "",
       isLetsEncryptEnabled: false,
       mail_module: "",
+      mail_domain: "",
       mail_modules_id: [],
       accepted_timezone_list: [],
       locale: "",
@@ -540,7 +541,13 @@ export default {
       this.locale = config.locale;
       // force to reload value after dom update
       this.$nextTick(() => {
-        this.mail_module = config.mail_module;
+        const mail_module_tmp = config.mail_module;
+        const mail_domain_tmp = config.mail_domain;
+        if (mail_module_tmp && mail_domain_tmp) {
+          this.mail_module = mail_module_tmp + ': ' + mail_domain_tmp;
+        } else {
+          this.mail_module = "";
+        }
         this.timezone = config.timezone;
       });
       this.loading.getConfiguration = false;
@@ -618,14 +625,17 @@ export default {
         `${taskAction}-completed-${eventId}`,
         this.configureModuleCompleted
       );
-
+      const tmparray = this.mail_module.split(': ');
+      const mail_module_tmp = tmparray[0];
+      const mail_domain_tmp = tmparray[1];
       const res = await to(
         this.createModuleTaskForApp(this.instanceName, {
           action: taskAction,
           data: {
             hostname: this.hostname,
             request_https_certificate: this.isLetsEncryptEnabled,
-            mail_module: this.mail_module,
+            mail_module: mail_module_tmp,
+            mail_domain: mail_domain_tmp,
             locale: this.locale,
             timezone: this.timezone,
             webapp: {