fixes new fields

pedrobc · pedrobc · commit 5963f5749856 · 2011-08-31T13:26:05.000+02:00
diff --git a/lib/form/mmReadOnlyBaseForm.class.php b/lib/form/mmReadOnlyBaseForm.class.php
@@ -71,16 +71,17 @@ private function _handleReadOnlyField($fieldName)
     if($this->getWidgetSchema()->offsetExists($fieldName))
     {
       $this->_setWidgetReadOnly($fieldName);
-      try {
-        $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(
-          'value' => $this->getObject()->$fieldName,
-		  'is_new' => $this->getObject()->isNew(),
-        ));
-      } catch(Doctrine_Record_UnknownPropertyException $e) {
-        //It's a "virtual" field. No need to validate it since it's not going to be saved in db
-      } catch(Exception $e) {
-        //throw new Exception(__FILE__.':'.__LINE__.' encountered an exception: ' . $e->getMessage());
+      if($this instanceof sfFormDoctrine && !$this->getObject()->isNew())
+      {
+        $value = $this->getObject()->$fieldName;
+      }
+      else
+      {
+        $value = $this->getValue($fieldName);
       }
+      $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(
+        'widget' => $this->validatorSchema[$fieldName]
+      ));
     }
   }
 
@@ -178,7 +179,7 @@ private function _setWidgetReadOnly($fieldName)
     }
     elseif($this->widgetSchema[$fieldName] instanceof sfWidgetFormDate)
     {
-      $this->widgetSchema[$fieldName] = new mmWidgetFormDateReadOnly();
+      $this->widgetSchema[$fieldName] = new mmWidgetFormDateReadOnly($this->widgetSchema[$fieldName]->getOptions(), $this->widgetSchema[$fieldName]->getAttributes());
     }
     else
     {
@@ -204,7 +205,6 @@ public function setReadOnly(array $fields = array())
       }
     }
 
-    //TODO: Also set embedded forms read-only
     foreach($this->getEmbeddedForms() as $f)
     {
       $f->setReadOnly();
diff --git a/lib/validator/mmValidatorReadOnly.class.php b/lib/validator/mmValidatorReadOnly.class.php
@@ -18,8 +18,7 @@ class mmValidatorReadOnly extends sfValidatorBase
    */
   protected function configure($options = array(), $messages = array())
   {
-    $this->addRequiredOption('value');
-    $this->addRequiredOption('is_new');
+    $this->addRequiredOption('widget');
     $this->setOption('required', false);
   }
 
@@ -28,6 +27,6 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    return $this->getOption('is_new') ? $value : $this->getOption('value');
+    return $this->getOption('widget')->getDefault();
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -71,16 +71,17 @@ private function _handleReadOnlyField($fieldName)`
`71`	`71`	`if($this->getWidgetSchema()->offsetExists($fieldName))`
`72`	`72`	`{`
`73`	`73`	`$this->_setWidgetReadOnly($fieldName);`
`74`		`- try {`
`75`		`- $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(`
`76`		`- 'value' => $this->getObject()->$fieldName,`
`77`		`- 'is_new' => $this->getObject()->isNew(),`
`78`		`- ));`
`79`		`- } catch(Doctrine_Record_UnknownPropertyException $e) {`
`80`		`- //It's a "virtual" field. No need to validate it since it's not going to be saved in db`
`81`		`- } catch(Exception $e) {`
`82`		`- //throw new Exception(__FILE__.':'.__LINE__.' encountered an exception: ' . $e->getMessage());`
	`74`	`+ if($this instanceof sfFormDoctrine && !$this->getObject()->isNew())`
	`75`	`+ {`
	`76`	`+ $value = $this->getObject()->$fieldName;`
	`77`	`+ }`
	`78`	`+ else`
	`79`	`+ {`
	`80`	`+ $value = $this->getValue($fieldName);`
`83`	`81`	`}`
	`82`	`+ $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(`
	`83`	`+ 'widget' => $this->validatorSchema[$fieldName]`
	`84`	`+ ));`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
`@@ -178,7 +179,7 @@ private function _setWidgetReadOnly($fieldName)`
`178`	`179`	`}`
`179`	`180`	`elseif($this->widgetSchema[$fieldName] instanceof sfWidgetFormDate)`
`180`	`181`	`{`
`181`		`- $this->widgetSchema[$fieldName] = new mmWidgetFormDateReadOnly();`
	`182`	`+ $this->widgetSchema[$fieldName] = new mmWidgetFormDateReadOnly($this->widgetSchema[$fieldName]->getOptions(), $this->widgetSchema[$fieldName]->getAttributes());`
`182`	`183`	`}`
`183`	`184`	`else`
`184`	`185`	`{`
`@@ -204,7 +205,6 @@ public function setReadOnly(array $fields = array())`
`204`	`205`	`}`
`205`	`206`	`}`
`206`	`207`
`207`		`- //TODO: Also set embedded forms read-only`
`208`	`208`	`foreach($this->getEmbeddedForms() as $f)`
`209`	`209`	`{`
`210`	`210`	`$f->setReadOnly();`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@ class mmValidatorReadOnly extends sfValidatorBase`
`18`	`18`	`*/`
`19`	`19`	`protected function configure($options = array(), $messages = array())`
`20`	`20`	`{`
`21`		`- $this->addRequiredOption('value');`
`22`		`- $this->addRequiredOption('is_new');`
	`21`	`+ $this->addRequiredOption('widget');`
`23`	`22`	`$this->setOption('required', false);`
`24`	`23`	`}`
`25`	`24`
`@@ -28,6 +27,6 @@ protected function configure($options = array(), $messages = array())`
`28`	`27`	`*/`
`29`	`28`	`protected function doClean($value)`
`30`	`29`	`{`
`31`		`- return $this->getOption('is_new') ? $value : $this->getOption('value');`
	`30`	`+ return $this->getOption('widget')->getDefault();`
`32`	`31`	`}`
`33`		`-}`
	`32`	`+}`