Changeset 9501

Timestamp:

06/09/08 19:56:13 (2 years ago)

Author:

fabien

Message:

added pre and post validator merge for embedForm and embedFormForEach

Files:

• branches/1.1/lib/form/sfForm.class.php (modified) (3 diffs)
• branches/1.1/test/unit/form/sfFormTest.php (modified) (1 diff)

branches/1.1/lib/form/sfForm.class.php

@@ -270 +270 @@
-    $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
-    $this->validatorSchema[$name] = $form->getValidatorSchema();
-
+
+
+
+
-    $this->resetFormFields();
-  }
@@ -318 +321 @@
-    $this->validatorSchema[$name] = new sfValidatorSchemaForEach($form->getValidatorSchema(), $n);
-
+    $this->mergePreValidator($form->getValidatorSchema()->getPreValidator());
+    $this->mergePostValidator($form->getValidatorSchema()->getPostValidator());
+
-    $this->resetFormFields();
-  }
@@ -344 +350 @@
-      $this->widgetSchema[$field] = $widget;
-    }
-
+
-    foreach ($form->getValidatorSchema()->getFields() as $field => $validator)
-    {
-      $this->validatorSchema[$field] = $validator;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-      $this->validatorSchema->setPreValidator(new sfValidatorAnd(array(
-!is_null($this->validatorSchema->getPreValidator()) ? $this->validatorSchema->getPreValidator() : new sfValidatorPass(), 
-form->getValidatorSchema()->getPreValidator()
+$this->validatorSchema->getPreValidator(),
+validator
-      )));
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-      $this->validatorSchema->setPostValidator(new sfValidatorAnd(array(
-!is_null($this->validatorSchema->getPostValidator()) ? $this->validatorSchema->getPostValidator() : new sfValidatorPass(), 
-form->getValidatorSchema()->getPostValidator()
+$this->validatorSchema->getPostValidator(),
+validator
-      )));
-    }
-
-    $this->resetFormFields();
-  }
-

branches/1.1/test/unit/form/sfFormTest.php

@@ -601 +601 @@
-$t->isa_ok($widgetSchema['c'], 'sfWidgetFormTextarea', 'mergeForm() overrides original form widget');
-$t->isa_ok($validatorSchema['c'], 'sfValidatorPass', 'mergeForm() overrides original form validator');
-And
-And
+Pass
+Pass
-
-try