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

phpmyadmin · May 15, 2014 · ebad795 · ebad795
2 parents fcd437c + 1a3c958
commit ebad795
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
@@ -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) {