Merge pull request #550 from Neriderc/fix-url-xref

Fix url xref
tillsc · Dec 13, 2024 · 3f53f49 · 3f53f49
2 parents 25de7e2 + 2325d3b
commit 3f53f49
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/resources/javascript/gvexport.js b/resources/javascript/gvexport.js
@@ -56,6 +56,8 @@ function stopIndiSelectChanged() {
 }
 
 function loadXrefList(url, xrefListId, indiListId) {
+    if (url === '') return false;
+
     let xrefListEl = document.getElementById(xrefListId);
     let xref_list = xrefListEl.value.trim();
     xrefListEl.value = xref_list;
@@ -243,29 +245,24 @@ function showGraphvizUnsupportedMessage() {
 }
 
 // This function is run when the page is loaded
-function pageLoaded(Url) {
-
-    // Load settings for logged out user
+async function pageLoaded(Url) {
     if (firstRender) {
-        isUserLoggedIn().then((loggedIn) => {
-            if (!loggedIn) {
-                Data.storeSettings.getSettingsClient(ID_MAIN_SETTINGS).then((obj) => {
-                    if (obj !== null) {
-                        Form.settings.load(JSON.stringify(obj));
-                    } else {
-                        firstRender = false;
-                    }
-                })
+        const loggedIn = await isUserLoggedIn();
+        if (!loggedIn) {
+            const settings = await Data.storeSettings.getSettingsClient(ID_MAIN_SETTINGS);
+            if (settings !== null) {
+                Form.settings.load(JSON.stringify(settings));
+            } else {
+                firstRender = false;
             }
-
-            loadURLXref(Url);
-            refreshIndisFromXREFS(false);
-        });
+        }
     }
 
     TOMSELECT_URL = document.getElementById('pid').getAttribute("data-wt-url") + "&query=";
     loadUrlToken(Url);
     loadSettingsDetails();
+    loadURLXref(Url);
+    refreshIndisFromXREFS(false);
     // Remove reset parameter from URL when page loaded, to prevent
     // further resets when page reloaded
     Url.removeURLParameter("reset");