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

Fixed importing the exported config on Server status monitor page

Browse Source 
- 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 <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-04-25 20:33:18 +02:00
parent 1343cf2b84
commit dd299c7ceb
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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