Ticket #635: 635-jForms-add-support-of-the-required-attribute-on-checkebox.diff

lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

@@ -3 +3 @@
-* @package    jelix
-* @subpackage forms
-* @author     Laurent Jouanneau
-
+, Julien Issler
-* @contributor Uriel Corfa Emotic SARL
-* @copyright   2006-2008 Laurent Jouanneau
-* @copyright   2007 Loic Mathaud, 2007 Dominique Papin
-* @copyright   2007 Emotic SARL
+* @copyright   2008 Julien Issler
-* @link        http://www.jelix.org
-* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
-*/
@@ -185 +186 @@
-            $source[]='$ctrl->valueOnUncheck=\''.str_replace("'","\\'", $attributes['valueonuncheck']) ."';";
-            unset($attributes['valueonuncheck']);
-        }
+        $this->attrRequired($source, $attributes);
-        return false;
-    }
-

lib/jelix/forms/jFormsControl.class.php

@@ -3 +3 @@
-* @package     jelix
-* @subpackage  forms
-* @author      Laurent Jouanneau
-
+, Julien Issler
-* @copyright   2006-2008 Laurent Jouanneau, 2007 Dominique Papin
-* @copyright   2007 Loic Mathaud
+* @copyright   2008 Julien Issler
-* @link        http://www.jelix.org
-* @licence     http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
-*/
@@ -222 +223 @@
-
-    function check(){
-        $value = $this->container->data[$this->ref];
+        if($this->required && $value == $this->valueOnUncheck)
+            return $this->container->errors[$this->ref] = jForms::ERRDATA_REQUIRED;
-        if($value != $this->valueOnCheck && $value != $this->valueOnUncheck)
-            return $this->container->errors[$this->ref] = jForms::ERRDATA_INVALID;
-        return null;