From eac122985b55811b5215f9bbf27935c9c9702c32 Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Wed, 20 Mar 2024 15:40:50 +0100
Subject: [PATCH] Fix LDAP domain loading issue in Settings.vue

---
 ui/src/views/Settings.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
index 4808464..6493300 100644
--- a/ui/src/views/Settings.vue
+++ b/ui/src/views/Settings.vue
@@ -309,6 +309,13 @@ export default {
       this.host = config.host;
       this.isLetsEncryptEnabled = config.lets_encrypt;
       this.isHttpToHttpsEnabled = config.http2https;
+      // force to reload value after dom update
+      this.$nextTick(() => {
+        this.ldap_domain = config.ldap_domain;
+        if (!this.ldap_domain) {
+          this.ldap_domain = "-";
+        }
+      });
       // for NSComboBox we need to create a temporary variable
       let ldap_domain_list_tmp = config.ldap_domain_list;
       ldap_domain_list_tmp.unshift({
@@ -317,14 +324,6 @@ export default {
         value: "-",
       });
       this.ldap_domain_list = ldap_domain_list_tmp;
-      // force to reload value after dom update
-      this.$nextTick(() => {
-        this.ldap_domain = config.ldap_domain;
-        if (!this.ldap_domain) {
-          this.ldap_domain = "-";
-        }
-      });
-      this.loading.getConfiguration = false;
       // set already_set to true if the configuration is not empty
       if (
         this.wikiName &&
@@ -335,6 +334,7 @@ export default {
       ) {
         this.already_set = true;
       }
+      this.loading.getConfiguration = false;
 
       this.focusElement("host");
     },