From 5a6e07199bd5bcec02a7e931bcaa7b60b314e491 Mon Sep 17 00:00:00 2001 From: Manus Freedom Date: Tue, 30 Mar 2021 10:43:06 +0200 Subject: [PATCH] Fix datetime decimal displayed after edit Signed-off-by: Romain Lapoux --- js/src/makegrid.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/src/makegrid.js b/js/src/makegrid.js index 384d1b5d0336..8e215b01b97c 100644 --- a/js/src/makegrid.js +++ b/js/src/makegrid.js @@ -683,14 +683,16 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid var newHtml = Functions.escapeHtml(value); newHtml = newHtml.replace(/\n/g, '
\n'); + var decimals = parseInt($thisField.attr('data-decimals')); + // remove decimal places if column type not supported - if (($thisField.attr('data-decimals') === 0) && ($thisField.attr('data-type').indexOf('time') !== -1)) { + if ((decimals === 0) && ($thisField.attr('data-type').indexOf('time') !== -1)) { newHtml = newHtml.substring(0, newHtml.indexOf('.')); } - // remove addtional decimal places - if (($thisField.attr('data-decimals') > 0) && ($thisField.attr('data-type').indexOf('time') !== -1)) { - newHtml = newHtml.substring(0, newHtml.length - (6 - $thisField.attr('data-decimals'))); + // remove additional decimal places + if ((decimals > 0) && ($thisField.attr('data-type').indexOf('time') !== -1)) { + newHtml = newHtml.substring(0, newHtml.length - (6 - decimals)); } var selector = 'span';