diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 5cbb90440..1e3e3e8a6 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -1851,6 +1851,8 @@ function removeValue(id){ function datePicker4(obj, id, mask, startDate, endDate, showTIme){ //alert('->'+id); + if(showTIme=='false') + showTIme=false; new Calendar({ inputField: id, dateFormat: mask, diff --git a/gulliver/js/grid/core/grid.js b/gulliver/js/grid/core/grid.js index 96fabdb64..770a6d8b9 100644 --- a/gulliver/js/grid/core/grid.js +++ b/gulliver/js/grid/core/grid.js @@ -164,7 +164,7 @@ var G_Grid = function(oForm, sGridName) { newID = aObjects[0].id.replace(/\[1\]/g, '\[' + (this.oGrid.rows.length - 2) + '\]'); aObjects[0].setAttribute('id', newID); - aObjects[0].setAttribute('value', ''); + //aObjects[0].setAttribute('value', ''); aObjects[0].name = newID; if (/*@cc_on!@*/0) { // Internet Explorer test (needs to be modified for IE8) aObjects[0].mergeAttributes(document.createElement(""), false); @@ -178,7 +178,12 @@ var G_Grid = function(oForm, sGridName) { if(attributes.defaultvalue!= undefined) attributDefaultValue=attributes.defaultvalue; } else { - attributDefaultValue=''; + scriptTags = oNewRow.getElementsByTagName('td')[i].getElementsByTagName('script'); + attributes = elementAttributesNS(aObjects[0]); + if(attributes.value != undefined) + attributDefaultValue=attributes.value; + else + attributDefaultValue=''; } if (aObjects[0].type != 'checkbox' ) { @@ -276,7 +281,7 @@ var G_Grid = function(oForm, sGridName) { if (/*@cc_on!@*/0) { oNewRow.getElementsByTagName('td')[i].innerHTML = aux; } - // alert(oNewRow.getElementsByTagName('td')[i].innerHTML); + //alert(oNewRow.getElementsByTagName('td')[i].innerHTML); break; case 'select': aObjects = oNewRow.getElementsByTagName('td')[i].getElementsByTagName('select'); diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 9f34c6988..369303018 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3023,6 +3023,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText $endDate = G::replaceDataField ( $this->endDate, $owner->values ); $beforeDate = G::replaceDataField ( $this->beforeDate, $owner->values ); $afterDate = G::replaceDataField ( $this->afterDate, $owner->values ); + $value=$this->defaultValue; if ($startDate != '') { if (! $this->verifyDateFormat ( $startDate ))