Changeset 2122

Timestamp:

10/10/07 14:37:43 (15 months ago)

Author:

david

Message:

Fixed an issue where forms with the same action would both get error messages inserted under certain circumstances, thanks Ross for the hint. Also, errors that could ultimately not be inserted are now stored in request attribute "orphaned_errors", namespace "org.agavi.filter.FormPopulationFilter?". Refs #303

Location:

branches/0.11

Files:

• CHANGELOG (modified) (1 diff)
• src/filter/AgaviFormPopulationFilter.class.php (modified) (4 diffs)

branches/0.11/CHANGELOG

@@ -5 +5 @@
 
 ADD: __sleep() and __wakeup() magic methods for AgaviModel to prevent Context serialization (#581) (David)
-ADD: Ability to insert error messages into forms automatically using FormPopulationFilter (#303) (David)
+ADD: Ability to insert error messages into forms automatically using FormPopulationFilter (#303) (David, Ross Lawley)
 ADD: AgaviWebResponse::unsetCookie() (#577) (David, Ross Lawley)
 ADD: AgaviDoctrineDatabase (#381) (David, Ross Lawley)

branches/0.11/src/filter/AgaviFormPopulationFilter.class.php

@@ -242 +242 @@
       $forms = $this->xpath->query('//' . $this->ns . 'form[@action]');
     }
+    
+    // an array of all validation incidents; errors inserted for fields or multiple fields will be removed in here
+    $allIncidents = $vm->getIncidents();
+    
     foreach($forms as $form) {
       if($populate instanceof AgaviParameterHolder) {
@@ -270 +274 @@
       $remember = array();
 
-      // an array of all validation incidents; errors inserted for fields or multiple fields will be removed in here
-      $allIncidents = $vm->getIncidents();
-      
       // build the XPath query
       $query = 'descendant::' . $this->ns . 'textarea[@name] | descendant::' . $this->ns . 'select[@name] | descendant::' . $this->ns . 'input[@name and (not(@type) or @type="text" or (@type="checkbox" and not(contains(@name, "[]"))) or (@type="checkbox" and contains(@name, "[]") and @value) or @type="radio" or @type="password" or @type="file"';
@@ -473 +474 @@
 
       // now output the remaining incidents
-      if(!$this->insertErrorMessages($form, $errorMessageRules, $allIncidents)) {
-        $rq->setAttribute('lolz', $allIncidents, 'org.agavi.filter.FormPopulationFilter');
-      }
-    }
+      if($this->insertErrorMessages($form, $errorMessageRules, $allIncidents)) {
+        $allIncidents = array();
+      }
+    }
+    
+    $rq->setAttribute('orphaned_errors', $allIncidents, 'org.agavi.filter.FormPopulationFilter');
+    
     if($xhtml) {
       $fiveTwo = version_compare(PHP_VERSION, '5.2', 'ge');
@@ -579 +583 @@
   protected function insertErrorMessages(DOMElement $element, array $rules, array $incidents)
   {
+    if(!count($incidents)) {
+      // nothing to do here
+      return true;
+    }
+    
     $errorMessages = array();
     foreach($incidents as $incident) {