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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-05-15 17:35:31 +02:00
commit ebad795ac5
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/server_status_monitor.js
View File

@ -1272,10 +1272,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
}
function PMA_getLogAnalyseDialog(min, max) {
$('#logAnalyseDialog input[name="dateStart"]')
.val(PMA_formatDateTime(min, true));
$('#logAnalyseDialog input[name="dateEnd"]')
.val(PMA_formatDateTime(max, true));
var $dateStart = $('#logAnalyseDialog input[name="dateStart"]');
var $dateEnd = $('#logAnalyseDialog input[name="dateEnd"]');
$dateStart.val(PMA_formatDateTime(min, true));
$dateEnd.val(PMA_formatDateTime(max, true));
var dlgBtns = { };
@ -1294,6 +1294,17 @@ AJAX.registerOnload('server_status_monitor.js', function () {
height: 'auto',
buttons: dlgBtns
});
PMA_addDatepicker($dateStart, 'datetime', {
showMillisec: false,
showMicrosec: false,
timeFormat: 'HH:mm:ss'
});
PMA_addDatepicker($dateEnd, 'datetime', {
showMillisec: false,
showMicrosec: false,
timeFormat: 'HH:mm:ss'
});
}
function loadLog(type, min, max) {