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

Merge remote-tracking branch 'origin/pull/12823'

Browse Source
This commit is contained in:
Michal Čihař 2017-01-18 09:33:08 +01:00
commit 9b4642af62
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/server_status_queries.js
View File

@ -16,9 +16,10 @@ AJAX.registerOnload('server_status_queries.js', function () {
// Build query statistics chart
var cdata = [];
try {
$.each(JSON.parse($('#serverstatusquerieschart_data').text()), function (key, value) {
$.each(JSON.parse($('#serverstatusquerieschart').text()), function (key, value) {
cdata.push([key, parseInt(value, 10)]);
});
$('#serverstatusquerieschart').empty();
$('#serverstatusquerieschart').data(
'queryPieChart',
PMA_createProfilingChart(

3
libraries/server_status_queries.lib.php
View File

@ -134,8 +134,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
$retval .= '</tbody>';
$retval .= '</table>';
$retval .= '<div id="serverstatusquerieschart"></div>';
$retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
$retval .= '<div id="serverstatusquerieschart">';
if ($other_sum > 0) {
$chart_json[__('Other')] = $other_sum;
}

7
test/libraries/PMA_server_status_queries_test.php
View File

@ -219,12 +219,9 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
//validate 3:serverstatusquerieschart
$this->assertContains(
'<div id="serverstatusquerieschart"></div>',
$html
);
$this->assertContains(
'<div id="serverstatusquerieschart_data"',
'<div id="serverstatusquerieschart">',
$html
);
}
}