From a40a1229b7fce40c1b9ba63fc84d551e406ade08 Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Thu, 16 Jun 2011 10:53:08 -0400 Subject: [PATCH] BUG 6934 solucionado el campo date con time --- gulliver/js/form/core/form.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 4776276f5..8375a2718 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -414,15 +414,12 @@ function G_Text( form, element, name, type ) attributes.mask=attributes.mask.replace('%d','dd'); attributes.mask=attributes.mask.replace('%m','mm'); attributes.mask=attributes.mask.replace('%y','yy'); - attributes.mask=attributes.mask.replace('%Y','yyyy'); + attributes.mask=attributes.mask.replace('%Y','yyyy'); + attributes.mask=attributes.mask.replace('%H','mm'); + attributes.mask=attributes.mask.replace('%M','mm'); + attributes.mask=attributes.mask.replace('%S','mm'); me.mask=attributes.mask; } - - if(me.mask=='yyyy-mm-dd %H:%M:%S') - me.mask = 'yyyy-mm-dd mm:mm:mm'; - if(me.mask=='yyyy-mm-dd %H:%M') - me.mask = 'yyyy-mm-dd mm:mm'; - if (me.mask !=='' ) { if ((keyCode < 48 || keyCode > 57) && (keyCode != 8 && keyCode != 0 && keyCode != 46)) return false; if((keyCode===118 || keyCode===86) && event.ctrlKey) return false;