Ticket #193: siwapp.193.diff

apps/siwapp/modules/recurring/templates/editSuccess.php

@@ -49 +49 @@
         <li>
           <span>
             <span class="_75 _last">
-              <?php echo $invoiceForm['enabled']->renderLabel()?><?php echo $invoiceForm['enabled']?>
+              <?php echo $invoiceForm['enabled']->renderLabel()?>
+              <?php echo $invoiceForm['enabled']?>
+              <?php echo $invoiceForm['enabled']->renderError()?>
               &nbsp;&nbsp;
               <?php echo $invoiceForm['max_occurrences']->renderLabel()?>
               <?php echo $invoiceForm['max_occurrences']->render(array('class'=>'short'))?>

lib/form/RecurringInvoiceForm.class.php

@@ -97 +97 @@
     // validators
     $this->validatorSchema['tags']    = new sfValidatorString(array('required'=>false));
     $this->validatorSchema['customer_email'] = new sfValidatorEmail(array('max_length' => 100, 'required' => false));
+    $this->validatorSchema->setPostValidator(new sfValidatorSchemaAndOr(array('draft'=>new sfValidatorBoolean(),'enabled'=>new sfValidatorBoolean())));
 
-
     $this->addContainerForm('invoiceItems','RecurringInvoiceItemForm',array('key'=>'id','object'=>$o->getRecurringInvoiceItems()));
     
     $this->widgetSchema->setNameFormat("invoice[%s]");

lib/validator/sfValidatorSchemaAndOr.class.php

@@ +1 @@
+<?php
+  /**
+   * sfValidatorSchemaAndOr validates if all validators (each one associated
+   * with different fields) passes, or any of them (it depends on the logic
+   * specified in the options).
+   * 
+   * @author JoeZ <jzarate@gmail.com>
+   * @version SVN: $Id$
+   */
+class sfValidatorSchemaAndOr extends sfValidatorSchema
+{
+  const LOGIC_AND     = 'AND';
+  const LOGIC_OR      = 'OR';
+
+  protected
+    $field_validator_array = array();
+
+  /**
+   * Constructor.
+   *
+   * The first argument can be:
+   *
+   *  * null
+   *  * an associative array 
+   *    with field names as keys and sfValidatorBase instances as values
+   *
+   * @param mixed $validators Initial field=>validator array
+   * @param array $options    An array of options
+   * @param array $messages   An array of error messages
+   *
+   */
+  public function __construct($field_validator_array = null,$options = array(), $messages = array())
+  {
+    if(is_array($field_validator_array))
+    {
+      foreach($field_validator_array as $field => $validator)
+      {
+        $this->field_validator_array[$field] = $validator;
+      }
+    }
+    else if(!is_null($field_validator_array))
+    {
+      throw new InvalidArgumentException('sfValidatorSchemaAndOr constructor takes a field=>sfValidatorBase array.');
+    }
+    parent::__construct($options,$messages);
+  }
+
+  /** 
+   * Configures the current validator.
+   *
+   * Available options:
+   *
+   *  * logic: Logic to use "AND" , "OR"
+   *
+   * @param array $options  An array of optiones
+   * @param array $messages An array of error messages
+   *
+   */
+  protected function configure($options = array(),$messages = array())
+  {
+    $this->addOption('logic_to_use',sfValidatorSchemaAndOr::LOGIC_AND);
+    $this->addMessage('enabled', 'ennnnabbb');
+    $this->setMessage('enabled','sisisisisisi');
+  }
+
+  protected function doClean($values)
+  {
+    $clean = array();
+    $valid = true;
+    $errors = array();
+    foreach($this->field_validator_array as $field => $validator)
+    {
+      try
+      {
+        $clean[$values[$field]] = $validator->clean($values[$field]);
+      }
+      catch(sfValidatorError $e)
+      {
+        $errors[$field] = $e;
+        throw $e;
+      }
+    }
+    throw new sfValidatorError($this,'invalid');
+    if( (count($errors) && $this->getOption('logic_to_use') == sfValidatorSchemaAndOr::LOGIC_AND) ||
+        (count($errors) == count($this->field_validator_array) && $this->getOption('logic_to_use') == sfValidatorSchemaAndOr::LOGIC_OR))
+    {
+      throw new sfValidatorErrorSchema($this,array_values($errors));
+    }
+    return $values;
+  }
+
+}
+ No newline at end of file