BUG 6579 Problem with grids in view mode

- Changes made in datepicker mode
- Last changes made before at 2.0.16
This commit is contained in:
Enrique Ponce De Leon
2011-04-14 11:45:33 -04:00
parent e86d8d5b34
commit 087fb82281

View File

@@ -3210,7 +3210,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
public $editable;
var $hint;
var $onchange;
/**
var $renderMode = '';
/*
* Verify the format of a date
* @param <Date> $date
* @return <Boolean> true/false
@@ -3277,6 +3279,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
*/
function render($value = NULL, $owner = NULL)
{
$this->renderMode = $this->mode;
if (($this->pmconnection != '') && ($this->pmfield != '') && $value == NULL) {
$value = $this->getPMTableValue($owner);
}
@@ -3299,8 +3302,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
{
$result = array ();
$r = 1;
if( ! isset($owner->modeGrid)) $owner->modeGrid = '';
$this->mode = $this->modeForGrid;
/* if( ! isset($owner->modeGrid)) $owner->modeGrid = '';
$this->mode = $this->modeForGrid;*/
if ($owner->mode != 'view') $this->renderMode = $this->modeForGrid;
foreach ( $values as $v ) {
$v = G::replaceDataField ( $v, $owner->values );
if (! $onlyValue) {
@@ -3473,7 +3477,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
#the validations field was moved to javascript routines ;)
if ($this->mode == 'edit') {
if ($this->renderMode == 'edit') {
if( $startDate=='1969-12-31' ) {
$startDate='';
$endDate='';