Disable chat in webtop with ''

NethServer · Nov 29, 2023 · 12747bf · 12747bf
1 parent 52ddb0f
commit 12747bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/imageroot/actions/configure-module/20config b/imageroot/actions/configure-module/20config
@@ -185,8 +185,8 @@ if "timezone" in data and data["timezone"] != os.environ["WEBTOP_TIMEZONE"]:
     agent.set_env("RESTART_WEBDAV", "1")
     agent.set_env("RESTART_Z_PUSH", "1")
 
-# adjust the ejabberd module, when we disabled globally the chat module we use '-' as ejabberd module (needed by NSCombobox)
-if "ejabberd_module" in data and data["ejabberd_module"] != '-' and "ejabberd_domain" in data:
+# adjust the ejabberd module, when we disabled globally the chat module we use ''
+if "ejabberd_module" in data and "ejabberd_domain" in data:
     if data["ejabberd_module"] != os.getenv("EJABBERD_MODULE","") and data["ejabberd_domain"] != os.getenv("EJABBERD_DOMAIN",""):
         ejabberd_module = data["ejabberd_module"]
         ejabberd_domain = data["ejabberd_domain"]

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -681,7 +681,7 @@ export default {
       const mail_module_tmp = tmparray[0];
       const mail_domain_tmp = tmparray[1];
       const tmp_ejabberd = this.ejabberd_module.split(',');
-      const ejabberd_module_tmp = tmp_ejabberd[0] || "";
+      const ejabberd_module_tmp = tmp_ejabberd[0] !== '-' ? tmp_ejabberd[0] || "" : "";
       const ejabberd_domain_tmp = tmp_ejabberd[1] || "";
       const res = await to(
         this.createModuleTaskForApp(this.instanceName, {