webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Code Activity

fixed bug #4257 Hide fractional seconds #2

Browse Source 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
This commit is contained in:
Viduranga Wijesooriya
2014-01-30 19:04:04 +05:30
parent d483b9f03a
commit efa453a8a0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/makegrid.js
View File

@@ -1020,11 +1020,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
parseInt(current_datetime_value.substring(5, 7)) - 1,
parseInt(current_datetime_value.substring(8, 10))
);
if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{"+ no_decimals +"}$")) {
var hour = current_datetime_value.substring(11, 13);
var min = current_datetime_value.substring(14, 16);
var sec = current_datetime_value.substring(17, 19);
var no_decimals = $td.data('decimals');
var hour = current_datetime_value.substring(11, 13);
var min = current_datetime_value.substring(14, 16);
var sec = current_datetime_value.substring(17, 19);
if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{"+ no_decimals +"}$")) {
if (no_decimals > 3){
var milli = current_datetime_value.substring(20, 23);
var micro = current_datetime_value.substring(23);
@@ -1042,6 +1043,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
date.setHours(hour, min, sec, milli);
date.setMicroseconds(micro);
}
if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}")) {
console.log("G");
date.setHours(hour, min, sec);
}
$editArea.datetimepicker('setDate', date);
}