Changeset 1067

Timestamp:

08/27/08 00:42:48 (3 months ago)

Author:

laurentj

Message:

little improvements in jforms

Files:

• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsCompiler_jf_1_0.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) (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/forms/jFormsBase.class.php

@@ -665 +665 @@
-
-    /**
-add a control to the form
+declare a child control to the form. The given control should be a child of an other control
-    * @param $control jFormsControl
-    */
-rotected
+ublic
-        $this->controls [$control->ref] = $control;
-        if($control->type =='submit')

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

@@ -174 +174 @@
-
-    protected function generateCheckbox(&$source, $control, &$attributes) {
-        $source[]='$ctrl->datatype= new jDatatypeBoolean();';
-        $this->attrDefaultvalue($source, $attributes);
-        $this->readLabel($source, $control, 'checkbox');

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

@@ -216 +216 @@
-    public $valueOnUncheck='0';
-
+    function __construct($ref){
+        $this->ref = $ref;
+        $this->datatype = new jDatatypeBoolean();
+    }
+
-    function check(){
-        $value = $this->container->data[$this->ref];

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

@@ -565 +565 @@
-            echo htmlspecialchars($ctrl->itemsNames[$itemName]),'</label> ';
-
+            $displayedControls = false;
-            foreach($listctrl as $ref=>$c) {
-
+
+
-                echo ' <span class="jforms-item-controls">';
-                // we remove readonly status so when a user change the choice and 
@@ -579 +581 @@
-                $this->jsContent .="jForms.tControl2.addControl(jForms.tControl, '".str_replace("'","\\'",$itemName)."');\n";
-            }
-count($listctrl)
+$displayedControls
-                $this->jsContent .="jForms.tControl2.items['".str_replace("'","\\'",$itemName)."']=[];\n";
-            }

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

@@ -377 +377 @@
-$this->addControl($ctrl);',
-26=>'$ctrl= new jFormsControlcheckbox(\'nom\');
-$ctrl->datatype= new jDatatypeBoolean();
-$ctrl->label=\'Avez-vous un nom ?\';
-$this->addControl($ctrl);',
@@ -529 +528 @@
-$this->addControl($ctrl);',
-49=>'$ctrl= new jFormsControlcheckbox(\'nom\');
-$ctrl->datatype= new jDatatypeBoolean();
-$ctrl->label=\'Avez-vous un nom ?\';
-$ctrl->valueOnCheck=\'oui\';

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

@@ -472 +472 @@
-$this->addControl($ctrl);',
-24=>'$ctrl= new jFormsControlcheckbox(\'nom\');
-$ctrl->datatype= new jDatatypeBoolean();
-$ctrl->label=\'Avez-vous un nom ?\';
-$this->addControl($ctrl);',
@@ -603 +602 @@
-$this->addControl($ctrl);',
-42=>'$ctrl= new jFormsControlcheckbox(\'nom\');
-$ctrl->datatype= new jDatatypeBoolean();
-$ctrl->label=\'Avez-vous un nom ?\';
-$ctrl->valueOnCheck=\'oui\';