changes execution order

pedrobc · pedrobc · commit 2679c87ecb76 · 2011-08-31T15:57:45.000+02:00
diff --git a/lib/form/mmReadOnlyBaseForm.class.php b/lib/form/mmReadOnlyBaseForm.class.php
@@ -37,6 +37,8 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret
 
     $this->addCSRFProtection($this->localCSRFSecret);
     $this->resetFormFields();
+
+    $this->_handleReadOnlyFields();
   }
 
   /**
@@ -66,22 +68,25 @@ private function _handleNotVisibleField($fieldName)
    * Mark the widgets as readonly &&
    * creates a validator if appropriate
    */
-  private function _handleReadOnlyField($fieldName)
+  private function _handleReadOnlyFields()
   {
-    if($this->getWidgetSchema()->offsetExists($fieldName))
+    foreach($this->_readOnlyFields as $fieldName)
     {
-      $this->_setWidgetReadOnly($fieldName);
-      if($this instanceof sfFormDoctrine && !$this->getObject()->isNew())
-      {
-        $value = $this->getObject()->$fieldName;
-      }
-      else
+      if($this->getWidgetSchema()->offsetExists($fieldName))
       {
-        $value = $this->getValue($fieldName);
+        $this->_setWidgetReadOnly($fieldName);
+        if($this instanceof sfFormDoctrine)
+        {
+          $value = $this->widgetSchema[$fieldName]->getDefault() ? $this->widgetSchema[$fieldName]->getDefault() : $this->getObject()->$fieldName;
+        }
+        else
+        {
+          $value = $this->widgetSchema[$fieldName]->getDefault();
+        }
+        $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(
+          'value'   => $value,
+        ));
       }
-      $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(
-        'widget' => $this->validatorSchema[$fieldName]
-      ));
     }
   }
 
@@ -126,7 +131,7 @@ public function addReadOnlyField($fieldName)
     {
       throw new InvalidArgumentException(__FUNCTION__ . ': Invalid Argument type. Expected String, got ' . gettype($fieldName));
     }
-    $this->_handleReadOnlyField($fieldName);
+    $this->_readOnlyFields[] = $fieldName;
   }
 
   /**
@@ -139,7 +144,7 @@ public function addReadOnlyFields(array $fields)
   {
     foreach($fields as $fieldName)
     {
-      $this->_handleReadOnlyField($fieldName);
+      $this->_readOnlyFields[] = $fieldName;
     }
   }
 
@@ -201,7 +206,7 @@ public function setReadOnly(array $fields = array())
     {
       foreach($this->widgetSchema->getFields() as $fieldName => $w)
       {
-        $this->_handleReadOnlyField($fieldName);
+        $this->_readOnlyFields[] = $fieldName;
       }
     }
 
diff --git a/lib/validator/mmValidatorReadOnly.class.php b/lib/validator/mmValidatorReadOnly.class.php
@@ -18,7 +18,7 @@ class mmValidatorReadOnly extends sfValidatorBase
    */
   protected function configure($options = array(), $messages = array())
   {
-    $this->addRequiredOption('widget');
+    $this->addRequiredOption('value');
     $this->setOption('required', false);
   }
 
@@ -27,6 +27,6 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    return $this->getOption('widget')->getDefault();
+    return $this->getOption('value');
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret`
`37`	`37`
`38`	`38`	`$this->addCSRFProtection($this->localCSRFSecret);`
`39`	`39`	`$this->resetFormFields();`
	`40`	`+`
	`41`	`+ $this->_handleReadOnlyFields();`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`/**`
`@@ -66,22 +68,25 @@ private function _handleNotVisibleField($fieldName)`
`66`	`68`	`* Mark the widgets as readonly &&`
`67`	`69`	`* creates a validator if appropriate`
`68`	`70`	`*/`
`69`		`- private function _handleReadOnlyField($fieldName)`
	`71`	`+ private function _handleReadOnlyFields()`
`70`	`72`	`{`
`71`		`- if($this->getWidgetSchema()->offsetExists($fieldName))`
	`73`	`+ foreach($this->_readOnlyFields as $fieldName)`
`72`	`74`	`{`
`73`		`- $this->_setWidgetReadOnly($fieldName);`
`74`		`- if($this instanceof sfFormDoctrine && !$this->getObject()->isNew())`
`75`		`- {`
`76`		`- $value = $this->getObject()->$fieldName;`
`77`		`- }`
`78`		`- else`
	`75`	`+ if($this->getWidgetSchema()->offsetExists($fieldName))`
`79`	`76`	`{`
`80`		`- $value = $this->getValue($fieldName);`
	`77`	`+ $this->_setWidgetReadOnly($fieldName);`
	`78`	`+ if($this instanceof sfFormDoctrine)`
	`79`	`+ {`
	`80`	`+ $value = $this->widgetSchema[$fieldName]->getDefault() ? $this->widgetSchema[$fieldName]->getDefault() : $this->getObject()->$fieldName;`
	`81`	`+ }`
	`82`	`+ else`
	`83`	`+ {`
	`84`	`+ $value = $this->widgetSchema[$fieldName]->getDefault();`
	`85`	`+ }`
	`86`	`+ $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(`
	`87`	`+ 'value' => $value,`
	`88`	`+ ));`
`81`	`89`	`}`
`82`		`- $this->validatorSchema[$fieldName] = new mmValidatorReadOnly(array(`
`83`		`- 'widget' => $this->validatorSchema[$fieldName]`
`84`		`- ));`
`85`	`90`	`}`
`86`	`91`	`}`
`87`	`92`
`@@ -126,7 +131,7 @@ public function addReadOnlyField($fieldName)`
`126`	`131`	`{`
`127`	`132`	`throw new InvalidArgumentException(__FUNCTION__ . ': Invalid Argument type. Expected String, got ' . gettype($fieldName));`
`128`	`133`	`}`
`129`		`- $this->_handleReadOnlyField($fieldName);`
	`134`	`+ $this->_readOnlyFields[] = $fieldName;`
`130`	`135`	`}`
`131`	`136`
`132`	`137`	`/**`
`@@ -139,7 +144,7 @@ public function addReadOnlyFields(array $fields)`
`139`	`144`	`{`
`140`	`145`	`foreach($fields as $fieldName)`
`141`	`146`	`{`
`142`		`- $this->_handleReadOnlyField($fieldName);`
	`147`	`+ $this->_readOnlyFields[] = $fieldName;`
`143`	`148`	`}`
`144`	`149`	`}`
`145`	`150`
`@@ -201,7 +206,7 @@ public function setReadOnly(array $fields = array())`
`201`	`206`	`{`
`202`	`207`	`foreach($this->widgetSchema->getFields() as $fieldName => $w)`
`203`	`208`	`{`
`204`		`- $this->_handleReadOnlyField($fieldName);`
	`209`	`+ $this->_readOnlyFields[] = $fieldName;`
`205`	`210`	`}`
`206`	`211`	`}`
`207`	`212`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class mmValidatorReadOnly extends sfValidatorBase`
`18`	`18`	`*/`
`19`	`19`	`protected function configure($options = array(), $messages = array())`
`20`	`20`	`{`
`21`		`- $this->addRequiredOption('widget');`
	`21`	`+ $this->addRequiredOption('value');`
`22`	`22`	`$this->setOption('required', false);`
`23`	`23`	`}`
`24`	`24`
`@@ -27,6 +27,6 @@ protected function configure($options = array(), $messages = array())`
`27`	`27`	`*/`
`28`	`28`	`protected function doClean($value)`
`29`	`29`	`{`
`30`		`- return $this->getOption('widget')->getDefault();`
	`30`	`+ return $this->getOption('value');`
`31`	`31`	`}`
`32`	`32`	`}`