diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js index 41ebaaa6e..311f0323f 100755 --- a/gulliver/js/ext/pmos-common.js +++ b/gulliver/js/ext/pmos-common.js @@ -256,11 +256,13 @@ function _DF(DATE_TIME, D_FORMAT) { function LZ(x){return(x<0||x>9?"":"0")+x;} - if (typeof FORMATS != 'undefined') { - D_FORMAT = FORMATS.dateFormat; - } - else { - D_FORMAT = 'm/d/Y'; + if(typeof D_FORMAT == 'undefined'){ + if (typeof FORMATS != 'undefined') { + D_FORMAT = FORMATS.dateFormat; + } + else { + D_FORMAT = 'm/d/Y'; + } } if (!(DATE_TIME != '')) { diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index e49dd7b25..2d7c46f5a 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -360,7 +360,7 @@ Ext.onReady(function(){ //Function format dates showdate = function (value){ - return _DF(value); + return _DF(value, 'Y-m-d'); }; //Funtion Handles Context Menu Opening