gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_8'

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-04-25 20:59:21 +02:00
commit 37bb5907e5
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -101,6 +101,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

6
js/server_privileges.js
View File

@ -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');

11
js/server_status_monitor.js
View File

@ -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')) {