Changeset 1098

Timestamp:

09/24/08 12:08:19 (4 months ago)

Author:

julieni

Message:

ticket #635: jForms: Add support of the required attribute on <checkbox>

Files:

• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/docs/ns/jforms_1.0.rng (modified) (1 diff)
• trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.check_datas.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler_1_1.html_cli.php (modified) (2 diffs)

trunk/lib/jelix/CREDITS

@@ -33 +33 @@
- - jTpl plugins: number_format modifier (#679)
- - jForms: Javascript error handling does not work for element <checkboxes> (#636)
+ - jForms: Add support of the required attribute on <checkbox> (#635)
-
-Bastien Jaillot (aka bastnic)

trunk/lib/jelix/docs/ns/jforms_1.0.rng

@@ -127 +127 @@
-       <ref name="control.common" />
-       <ref name="UI.attr.readonly" />
+       <ref name="UI.attr.required" />
-       <ref name="UI.attr.defaultvalue" />
-       <optional><attribute name="valueoncheck" /></optional>

trunk/lib/jelix/docs/ns/jforms_1.1.rng

@@ -154 +154 @@
-       <ref name="control.common" />
-       <ref name="UI.attr.readonly" />
+       <ref name="UI.attr.required" />
-       <ref name="UI.attr.defaultvalue" />
-       <optional><attribute name="valueoncheck" /></optional>

trunk/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

@@ -4 +4 @@
-* @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
@@ -186 +187 @@
-            unset($attributes['valueonuncheck']);
-        }
+        $this->attrRequired($source, $attributes);
-        return false;
-    }

trunk/lib/jelix/forms/jFormsControl.class.php

@@ -4 +4 @@
-* @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
@@ -223 +224 @@
-    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;

trunk/testapp/modules/jelix_tests/tests/jforms.check_datas.html_cli.php

@@ -4 +4 @@
-* @subpackage  unittest module
-* @author      Jouanneau Laurent
-
+ Julien Issler
-* @copyright   2007-2008 Jouanneau laurent
+* @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
@@ -90 +91 @@
-        $this->form->setData('nom','1');
-        $this->assertTrue($this->form->check());
+        
+        $ctrl->required = true;
+        $this->form->setData('nom',null);
+        $this->assertFalse($this->form->check());
+        $this->form->setData('nom','');
+        $this->assertFalse($this->form->check());
+        $this->form->setData('nom','on');
+        $this->assertTrue($this->form->check());
+        $this->form->setData('nom','0');
+        $this->assertFalse($this->form->check());
+        $this->form->setData('nom','1');
+        $this->assertTrue($this->form->check());        
-    }
-

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -4 +4 @@
-* @subpackage  unittest module
-* @author      Jouanneau Laurent
-
+, Julien Issler
-* @copyright   2007-2008 Jouanneau laurent
-* @copyright   2007 Loic Mathaud
+* @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
@@ -701 +702 @@
-),
-array(
-'<checkbox ref="nom" xmlns="http://jelix.org/ns/forms/1.0" required="true">
-    <label>Votre nom</label>
-</checkbox>',
-'jelix~formserr.attribute.not.allowed',
-array('required','checkbox','myfile')
-),
-array(
-'<secret ref="pwd" defaultvalue="toto"  xmlns="http://jelix.org/ns/forms/1.0">
-<label>Votre mot de passe</label>

trunk/testapp/modules/jelix_tests/tests/jforms.compiler_1_1.html_cli.php

@@ -4 +4 @@
-* @subpackage  unittest module
-* @author      Jouanneau Laurent
-
+, Julien Issler
-* @copyright   2007-2008 Jouanneau laurent
-* @copyright   2007 Loic Mathaud, 2008 Dominique Papin
+* @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
@@ -900 +901 @@
-),
-array(
-'<checkbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" required="true">
-    <label>Votre nom</label>
-</checkbox>',
-'jelix~formserr.attribute.not.allowed',
-array('required','checkbox','myfile')
-),
-array(
-'<secret ref="pwd" defaultvalue="toto"  xmlns="http://jelix.org/ns/forms/1.1">
-<label>Votre mot de passe</label>