Changeset 1063

Timestamp:

08/26/08 00:29:07 (3 months ago)

Author:

laurentj

Message:

ticket #556: jforms, added support of minlength and maxlength on secret control

Files:

• trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (1 diff)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler_1_1.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (1 diff)

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

@@ -118 +118 @@
-       <ref name="UI.attr.readonly" />
-       <ref name="UI.attr.required" />
+       <ref name="attr.length" />
-       <ref name="attr.size" />
-       <optional>

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

@@ -83 +83 @@
-    }
-
+    protected function generateSecret(&$source, $control, &$attributes) {
+        if(isset($attributes['minlength'])){
+            $source[]='$ctrl->datatype->addFacet(\'minLength\','.intval($attributes['minlength']).');';
+            unset($attributes['minlength']);
+        }
+        if(isset($attributes['maxlength'])){
+            $source[]='$ctrl->datatype->addFacet(\'maxLength\','.intval($attributes['maxlength']).');';
+            unset($attributes['maxlength']);
+        }
+        return parent::generateSecret($source, $control, $attributes);
+    }
+
-    protected function generateHtmleditor(&$source, $control, &$attributes) {
-        $this->_generateTextareaHtmlEditor($source, $control, $attributes);

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

@@ -180 +180 @@
-    public $size=0;
-
-    function check(){
-        if ($this->container->data[$this->ref] == '' && $this->required) {
-            return $this->container->errors[$this->ref] = jForms::ERRDATA_REQUIRED;
-        }
-        return null;
-    }
-    function getDisplayValue($value){
-        return str_repeat("*", strlen($value));

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -445 +445 @@
-    protected function outputSecret($ctrl, $id, $class, $readonly, $hint) {
-        $size = ($ctrl->size == 0?'': ' size="'.$ctrl->size.'"');
-
+
+
+
+
+
+
-    }
-

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

@@ -375 +375 @@
-    <datasource dao="foo" method="bar" labelproperty="baz,biz" labelseparator=" - " valueproperty="plop" criteriafrom="prenom,nom"/>
-</menulist>',
-
+
+
+
+
-    );
-
@@ -828 +831 @@
-$ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz,biz\',\'plop\',\'\',null,\'prenom,nom\',\' - \');
-$this->addControl($ctrl);',
+83=>'$ctrl= new jFormsControlsecret(\'pwd\');
+$ctrl->datatype->addFacet(\'minLength\',5);
+$ctrl->datatype->addFacet(\'maxLength\',10);
+$ctrl->label=\'Votre mot de passe\';
+$ctrl2 = new jFormsControlSecretConfirm(\'pwd_confirm\');
+$ctrl2->primarySecret = \'pwd\';
+$ctrl2->label=\'confirmez\';
+$ctrl2->required = $ctrl->required;
+$this->addControl($ctrl);
+$this->addControl($ctrl2);',
-);
-

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

@@ -1003 +1003 @@
-jForms.tForm.addControl(jForms.tControl);
-', $this->builder->getJsContent());
+
+        $ctrl->datatype->addFacet('minLength',5);
+        $ctrl->datatype->addFacet('maxLength',10);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" maxlength="10" value="laurent"/>', $out);
+        $this->assertEqualOrDiff('jForms.tControl = new jFormsControlString(\'passwd\', \'mot de passe\');
+jForms.tControl.maxLength = \'10\';
+jForms.tControl.minLength = \'5\';
+jForms.tControl.errInvalid=\'La saisie de "mot de passe" est invalide\';
+jForms.tForm.addControl(jForms.tControl);
+', $this->builder->getJsContent());
+
-
-    }