Changeset 650

Timestamp:

11/22/07 22:25:30 (1 year ago)

Author:

laurentj

Message:

worked on ticket #251: add support of minlength and maxlength in jforms

Files:

• trunk/lib/jelix-scripts/commands/createform.cmd.php (modified) (1 diff)
• trunk/lib/jelix-scripts/commands/createform.cmd.php (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (3 diffs)

trunk/lib/jelix-scripts/commands/createform.cmd.php

@@ -88 +88 @@
-            if($property->required)
-                $attr.=' required="true"';
-
+
-            if($property->defaultValue !== null)
-                $attr.=' defaultvalue="'.htmlspecialchars($property->defaultValue).'"';
-
+
+
+
+
+
+
+
-            //if(false)
-            //    $attr.=' defaultvalue=""';

trunk/lib/jelix-scripts/commands/createform.cmd.php

@@ -88 +88 @@
-            if($property->required)
-                $attr.=' required="true"';
-
+
-            if($property->defaultValue !== null)
-                $attr.=' defaultvalue="'.htmlspecialchars($property->defaultValue).'"';
-
+
+
+
+
+
+
+
-            //if(false)
-            //    $attr.=' defaultvalue=""';

trunk/lib/jelix-www/js/jforms.js

@@ -308 +308 @@
-    this.isConfirmField = false;
-    this.confirmFieldOf = '';
+    this.minLength = -1;
+    this.maxLength = -1;
-}
-

trunk/lib/jelix-www/js/jforms.js

@@ -308 +308 @@
-    this.isConfirmField = false;
-    this.confirmFieldOf = '';
+    this.minLength = -1;
+    this.maxLength = -1;
-}
-

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

@@ -142 +142 @@
-            }
-            $source[]='$ctrl->defaultValue=\''.str_replace('\'','\\\'',(string)$control['defaultvalue']) .'\';';
+        }
+        // minlength support
+        if(isset($control['minlength'])){
+            if($controltype != 'textarea' && 
+                ($controltype != 'input'|| ($controltype == 'input' && isset($control['type']) && $control['type'] != 'string'))){
+                throw new jException('jelix~formserr.attribute.not.allowed',array('minlength',$controltype,$this->sourceFile));
+            }
+            $source[]='$ctrl->datasource->addFacet(\'minLength\','.intval((string)$control['minlength']).');';
+        }
+        // maxlength support
+        if(isset($control['maxlength'])){
+            if($controltype != 'textarea' && 
+                ($controltype != 'input'|| ($controltype == 'input' && isset($control['type']) && $control['type'] != 'string'))){
+                throw new jException('jelix~formserr.attribute.not.allowed',array('maxlength',$controltype,$this->sourceFile));
+            }
+            $source[]='$ctrl->datasource->addFacet(\'maxLength\','.intval((string)$control['maxlength']).');';
-        }
-

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

@@ -142 +142 @@
-            }
-            $source[]='$ctrl->defaultValue=\''.str_replace('\'','\\\'',(string)$control['defaultvalue']) .'\';';
+        }
+        // minlength support
+        if(isset($control['minlength'])){
+            if($controltype != 'textarea' && 
+                ($controltype != 'input'|| ($controltype == 'input' && isset($control['type']) && $control['type'] != 'string'))){
+                throw new jException('jelix~formserr.attribute.not.allowed',array('minlength',$controltype,$this->sourceFile));
+            }
+            $source[]='$ctrl->datasource->addFacet(\'minLength\','.intval((string)$control['minlength']).');';
+        }
+        // maxlength support
+        if(isset($control['maxlength'])){
+            if($controltype != 'textarea' && 
+                ($controltype != 'input'|| ($controltype == 'input' && isset($control['type']) && $control['type'] != 'string'))){
+                throw new jException('jelix~formserr.attribute.not.allowed',array('maxlength',$controltype,$this->sourceFile));
+            }
+            $source[]='$ctrl->datasource->addFacet(\'maxLength\','.intval((string)$control['maxlength']).');';
-        }
-

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

@@ -266 +266 @@
-64=>'<textarea ref="nom" rows="15" cols="20" xmlns="http://jelix.org/ns/forms/1.0">
-    <label>Votre nom</label>
-
+
+
+
+
-    );
-
@@ -614 +617 @@
-$ctrl->rows=15;
-$ctrl->cols=20;
-
+
+
+
+
+
-);
-
@@ -959 +966 @@
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-
+
+
+
+
+
+
+
-    );
-

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

@@ -266 +266 @@
-64=>'<textarea ref="nom" rows="15" cols="20" xmlns="http://jelix.org/ns/forms/1.0">
-    <label>Votre nom</label>
-
+
+
+
+
-    );
-
@@ -614 +617 @@
-$ctrl->rows=15;
-$ctrl->cols=20;
-
+
+
+
+
+
-);
-
@@ -959 +966 @@
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-
+
+
+
+
+
+
+
-    );
-