Changeset 1925

Timestamp:

05/11/07 10:32:35 (20 months ago)

Author:

dominik

Message:

Make the not operator hide all child errors and set the affected fields accordingly
closes #495

Files:

• branches/0.11/src/validator/AgaviNotoperatorValidator.class.php (modified) (2 diffs)

branches/0.11/src/validator/AgaviNotoperatorValidator.class.php

@@ -53 +53 @@
 
   /**
+   * Adds a validation result for a given field.
+   *
+   * @param      AgaviValidator The validator.
+   * @param      string The name of the field which has been validated.
+   * @param      int    The result of the validation.
+   *
+   * @author     Dominik del Bondio <ddb@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function addFieldResult($validator, $fieldname, $result)
+  {
+    // prevent reporting of any child validators
+  }
+
+  /**
+   * Adds an incident to the validation result. 
+   *
+   * @param      AgaviValidationIncident The incident.
+   *
+   * @author     Dominik del Bondio <ddb@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function addIncident(AgaviValidationIncident $incident)
+  {
+    // prevent reporting of any child validators
+  }
+
+  /**
    * Validates the operator by returning the inverse result of the child 
    * validator
@@ -70 +98 @@
     if($result == AgaviValidator::CRITICAL || $result == AgaviValidator::SUCCESS) {
       $this->result = max(AgaviValidator::ERROR, $result);
-      $this->throwError();
+      $this->throwError(null, $child->getFullArgumentNames());
       return false;
     } else {
+      // lets mark the fields of the child validator all as successful
+      $affectedFields = $child->getFullArgumentNames();
+      foreach($affectedFields as $field) {
+        parent::addFieldResult($this, $field, AgaviValidator::SUCCESS);
+      }
       return true;
     }