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

Drizzle has no usable query log, hide appropriate features in Server Status

Browse Source
This commit is contained in:
Piotr Przybylski 2011-07-21 23:23:34 +02:00
parent b364cfd211
commit 74a00a110f
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/server_status.js
View File

@ -1254,12 +1254,17 @@ $(function() {
events: {
selection: function(event) {
if(editMode) return false;
var $logAnalyseDialog = $('#logAnalyseDialog');
if ($logAnalyseDialog.length == 0) {
return false;
}
var extremesObject = event.xAxis[0],
min = extremesObject.min,
max = extremesObject.max;
$('#logAnalyseDialog').html(
$logAnalyseDialog.html(
'<p>' + PMA_messages['strSelectedTimeRange']
+ '<input type="text" name="dateStart" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(min)) + '" /> - '
+ '<input type="text" name="dateEnd" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(max)) + '" /></p>'
@ -1268,7 +1273,7 @@ $(function() {
+ PMA_messages['strLogAnalyseInfo']
);
PMA_addDatepicker($('#logAnalyseDialog').find('input[name="dateStart"],input[name="dateEnd"]'), {
PMA_addDatepicker($logAnalyseDialog.find('input[name="dateStart"],input[name="dateEnd"]'), {
showOn: 'focus',
beforeShow: function() {
// Fix wrong timepicker z-index, doesn't work without timeout
@ -1281,32 +1286,32 @@ $(function() {
var dlgBtns = { };
dlgBtns[PMA_messages['strFromSlowLog']] = function() {
var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
var dateStart = Date.parse($logAnalyseDialog.find('input[name="dateStart"]').attr('value')) || min;
var dateEnd = Date.parse($logAnalyseDialog.find('input[name="dateEnd"]').attr('value')) || max;
loadLogStatistics(
{ src: 'slow', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') }
);
$('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
$logAnalyseDialog.find('dateStart,dateEnd').datepicker('destroy');
$(this).dialog("close");
}
dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
var dateStart = Date.parse($logAnalyseDialog.find('input[name="dateStart"]').attr('value')) || min;
var dateEnd = Date.parse($logAnalyseDialog.find('input[name="dateEnd"]').attr('value')) || max;
loadLogStatistics(
{ src: 'general', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') }
);
$('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
$logAnalyseDialog.find('dateStart,dateEnd').datepicker('destroy');
$(this).dialog("close");
}
$('#logAnalyseDialog').dialog({
$logAnalyseDialog.dialog({
width: 'auto',
height: 'auto',
buttons: dlgBtns

7
server_status.php
View File

@ -1335,10 +1335,12 @@ function printMonitor() {
<img src="themes/dot.gif" class="icon ic_s_cog" alt="" />
<?php echo __('Settings'); ?>
</a>
<?php if (!PMA_DRIZZLE) { ?>
<a href="#monitorInstructionsDialog">
<img src="themes/dot.gif" class="icon ic_b_help" alt="" />
<?php echo __('Instructions/Setup'); ?>
</a>
<?php } ?>
<a href="#endChartEditMode" style="display:none;">
<img src="themes/dot.gif" class="icon ic_s_okay" alt="" />
<?php echo __('Done rearranging/editing charts'); ?>
@ -1467,10 +1469,11 @@ function printMonitor() {
<div id="loadingLogsDialog" title="<?php echo __('Loading logs'); ?>" style="display:none;">
</div>
<?php if (!PMA_DRIZZLE) { ?>
<div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>">
</div>
<?php } ?>
<table border="0" class="clearfloat" id="chartGrid">