diff --git a/front/js/common.js b/front/js/common.js index 3686ac9e..3fed6e92 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -1210,6 +1210,13 @@ function resetInitializedFlag() sessionStorage.setItem(sessionStorageKey, "false"); } + +// ----------------------------------------------------------------------------- +function isAppInitialized() +{ + return sessionStorage.getItem(sessionStorageKey) === "true"; +} + // ----------------------------------------------------------------------------- // check if cache needs to be refreshed because of setting changes $.get('api/app_state.json?nocache=' + Date.now(), function(appState) { @@ -1327,6 +1334,8 @@ const onAllCallsComplete = () => { console.log('✔ Cache intialized'); + location.reload(); + }; // Call the function to execute the code diff --git a/front/settings.php b/front/settings.php index b4c9ac5e..846b6bbd 100755 --- a/front/settings.php +++ b/front/settings.php @@ -455,7 +455,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { }); inputHtml += '' + - '
'; + `
`; } else if (setType === 'list' || setType === 'list.readonly') { settingKeyOfLists.push(codeName); @@ -771,7 +771,20 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { } else { - hideSpinner() + // chekc if the app is initialized and hide the spinner + if(isAppInitialized()) + { + hideSpinner() + } + else + { + // reload the page if not initialized to give time the background tasks to finish + setTimeout(() => { + + window.location.reload() + + }, 1000); + } } document.getElementById('lastImportedTime').innerHTML = humanReadable; @@ -860,6 +873,7 @@ function updateModalState() { // --------------------------------------------------------- // Show last time settings have been imported + showSpinner() handleLoadingDialog()