From 1343cf2b8416db17c5de8586cde23bed1d55dce1 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Apr 2019 20:05:04 +0200 Subject: [PATCH 1/4] Fix lint issues See: adb22280399b47e98390d8292cb21fadd4d66f1a Signed-off-by: William Desportes --- js/server_privileges.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 9cda50af6b..e8013d41a5 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -134,12 +134,12 @@ AJAX.registerOnload('server_privileges.js', function () { /** * Automatically switching to 'Use Text field' from 'No password' once start writing in text area */ - $('#text_pma_pw').on('input', function() { - if ($('#text_pma_pw').val() != '') { + $('#text_pma_pw').on('input', function () { + if ($('#text_pma_pw').val() !== '') { $('#select_pred_password').val('userdefined'); } }); - + $('#text_pma_change_pw').on('keyup', function () { meter_obj = $('#change_password_strength_meter'); meter_obj_label = $('#change_password_strength'); From dd299c7ceb0268d9aca8547620cbaea43ed4e39b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Apr 2019 20:33:18 +0200 Subject: [PATCH 2/4] Fixed importing the exported config on Server status monitor page - Missing value 'series' created a javascript error - Missing series value created an error 'NaN' on the Y axis - Added variable declaration - Added check if local storage is supported Signed-off-by: William Desportes --- js/server_status_monitor.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index e8fcaf5a5c..3408bcd1c9 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -564,8 +564,10 @@ AJAX.registerOnload('server_status_monitor.js', function () { $.each(runtime.charts, function (key, elem) { gridCopy[key] = {}; gridCopy[key].nodes = elem.nodes; + gridCopy[key].series = elem.series; gridCopy[key].settings = elem.settings; gridCopy[key].title = elem.title; + gridCopy[key].maxYLabel = elem.maxYLabel; }); var exportData = { monitorCharts: gridCopy, @@ -608,7 +610,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { }; reader.onload = function (e) { var data = e.target.result; - + var json = null; // Try loading config try { json = JSON.parse(data); @@ -627,11 +629,12 @@ AJAX.registerOnload('server_status_monitor.js', function () { // If json ok, try applying config try { - window.localStorage.monitorCharts = JSON.stringify(json.monitorCharts); - window.localStorage.monitorSettings = JSON.stringify(json.monitorSettings); + if (isStorageSupported('localStorage')) { + window.localStorage.monitorCharts = JSON.stringify(json.monitorCharts); + window.localStorage.monitorSettings = JSON.stringify(json.monitorSettings); + } rebuildGrid(); } catch (err) { - console.log(err); alert(PMA_messages.strFailedBuildingGrid); // If an exception is thrown, load default again if (isStorageSupported('localStorage')) { From a4cd1337785039b54222996fbfd3b482d7047a75 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Apr 2019 20:43:39 +0200 Subject: [PATCH 3/4] Add ChangeLog entry for dd299c7c Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 98d4e070cd..74e81925dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog - issue #14460 Fixed forms where submitted multiple times on CTRL + ENTER - issue #15038 Fixed console height was allowing a negative values - issue #15219 Fixed 'No Password' option does not switch automatically to 'Use Text Field' in add user account +- issue Fixed importing the exported config on Server status monitor page 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log From cae463f9bfd7746125561800298cc0ba8d6bf64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 22 Apr 2019 16:38:10 -0300 Subject: [PATCH 4/4] Ignore linkcheck for Scriptalicious MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "500 Server Error: Internal Server Error" Cherry-picked-from: 54cef387c655a06bb5a6ca3e6214e3b2200ce45a Signed-off-by: Maurício Meneghini Fauth --- doc/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/conf.py b/doc/conf.py index 88c0342f55..deafa71dfe 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -313,4 +313,6 @@ linkcheck_ignore = [ r'https://pecl.php.net/.*', # 403 Client Error: Forbidden r'https://authy.com/.*', + # 500 Server Error: Internal Server Error + r'http://www.scriptalicious.com/.*', ]