diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js index ff5f3a3f..78818c58 100755 --- a/front/js/settings_utils.js +++ b/front/js/settings_utils.js @@ -218,6 +218,7 @@ function removeOptionItem(option) { function updateOptionItem(option, value) { settingsChanged(); option.html(value); + option.val(value); } // ------------------------------------------------------------------- @@ -247,8 +248,6 @@ function initListInteractionOptions(selectorId) { $options.on('click', function() { const $option = $(this); - console.log('aaa'); - // Increment click counter clickCounter++; diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index f8ac0e87..dc18e630 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -656,8 +656,8 @@ "settings_expand_all": "Expand all", "settings_imported": "Last time settings were imported from the app.conf file", "settings_imported_label": "Settings imported", - "settings_missing": "Not all settings loaded, refresh the page! This is probably caused by a high load on the database or app startup sequence.", - "settings_missing_block": "You can not save your settings without specifying all setting keys. Refresh the page. This is probably caused by a high load on the database.", + "settings_missing": "Not all settings loaded! High load on the database or app startup sequence. Click the 🔄 reload button in the top.", + "settings_missing_block": "Not all settings were loaded correctly. This is probably caused by a high load on the database. Click the 🔄 reload button in the top.", "settings_old": "Importing settings and re-initializing...", "settings_other_scanners": "Other, non-device scanner plugins that are currently enabled.", "settings_other_scanners_icon": "fa-solid fa-recycle", diff --git a/front/settings.php b/front/settings.php index 7f311de4..e75ae3dc 100755 --- a/front/settings.php +++ b/front/settings.php @@ -724,7 +724,12 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX { console.log(`Error settingsNumberJSON != settingsNumberDB: ${settingsNumberJSON} != ${settingsNumberDB}`); - showModalOk('WARNING', ""); + showModalOk('WARNING', ""); + + setTimeout(() => { + clearCache() + }, 1500); + } else { var settingsArray = []; @@ -773,7 +778,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX } }); - // console.log(settingsArray); + console.log(settingsArray); // sanity check to make sure settings were loaded & collected correctly sanityCheck_notOK = true @@ -810,12 +815,12 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX console.log(missingCodeNamesOnPage); console.log(missingCodeNamesInDB); - showModalOk('WARNING', ""); + showModalOk('WARNING', ""); } } - if(sanityCheck_notOK == false ) + if(sanityCheck_notOK == false && false) { // trigger a save settings event in the backend $.ajax({