Changeset 605

Timestamp:

10/05/07 16:07:59 (1 year ago)

Author:

laurentj

Message:

fixed bug 295: defaultvalue attribute was not really supported

Files:

• branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
• branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
• branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (8 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (8 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsControl.class.php (modified) (5 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsControl.class.php (modified) (5 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (4 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (4 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.html.php (modified) (4 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.html.php (modified) (4 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (15 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (15 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.with_dao.html.php (modified) (2 diffs)
• branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.with_dao.html.php (modified) (2 diffs)
• branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
• branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (8 diffs)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (8 diffs)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (5 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (4 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html.php (modified) (4 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.html.php (modified) (4 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.html.php (modified) (4 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (15 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (15 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.with_dao.html.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.with_dao.html.php (modified) (2 diffs)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)

branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php

@@ -502 +502 @@
-        }
-        if(!isset($this->_container->datas[$control->ref])){
-v
+defaultV
-        }
-    }

branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php

@@ -502 +502 @@
-        }
-        if(!isset($this->_container->datas[$control->ref])){
-v
+defaultV
-        }
-    }

branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -175 +175 @@
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<input type="text"',$id,$readonly,$hint,$class,' value="',htmlspecialchars($value),'"',$this->_endt;
-            break;
-        case 'checkbox':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value =='')
-                $value = $ctrl->defaultValue;
-
-            if($ctrl->valueOnCheck == $value){
@@ -196 +192 @@
-            $attrs=' name="'.$ctrl->ref.'[]" id="'.$id;
-            $value = $this->_form->getData($ctrl->ref);
-            if($value == null){
-                $value = $ctrl->selectedValues;
-            }
-
-            if(is_array($value) && count($value) == 1)
@@ -225 +218 @@
-            $id=' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'_';
-            $value = $this->_form->getData($ctrl->ref);
-
-
-
+
+
+
+
+
-            }
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
@@ -238 +233 @@
-            echo '<select',$id,$readonly,$hint,$class,' size="1">';
-            $value = $this->_form->getData($ctrl->ref);
-
-
-
-
+
+
+
+
+
+
+
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-                echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';
@@ -251 +249 @@
-                echo '<select name="',$ctrl->ref,'[]" id="',$this->_name,'_',$ctrl->ref,'"',$readonly,$hint,$class,' size="',$ctrl->size,'" multiple="multiple">';
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
-                    $value = $ctrl->selectedValues;
-                }
-
-                if(is_array($value) && count($value) == 1)
@@ -270 +265 @@
-            }else{
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
-                    $value = $ctrl->selectedValues;
-                }
-
-                if(is_array($value)){
@@ -290 +282 @@
-        case 'textarea':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<textarea',$id,$readonly,$hint,$class,'>',htmlspecialchars($value),'</textarea>';
-            break;
@@ -300 +290 @@
-        case 'output':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<input type="hidden"',$id,' value="',htmlspecialchars($value),'"',$this->_endt;
-            echo '<span class="jforms-value"',$hint,'>',htmlspecialchars($value),'</span>';

branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -175 +175 @@
-        case 'input':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<input type="text"',$id,$readonly,$hint,$class,' value="',htmlspecialchars($value),'"',$this->_endt;
-            break;
-        case 'checkbox':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value =='')
-                $value = $ctrl->defaultValue;
-
-            if($ctrl->valueOnCheck == $value){
@@ -196 +192 @@
-            $attrs=' name="'.$ctrl->ref.'[]" id="'.$id;
-            $value = $this->_form->getData($ctrl->ref);
-            if($value == null){
-                $value = $ctrl->selectedValues;
-            }
-
-            if(is_array($value) && count($value) == 1)
@@ -225 +218 @@
-            $id=' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'_';
-            $value = $this->_form->getData($ctrl->ref);
-
-
-
+
+
+
+
+
-            }
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
@@ -238 +233 @@
-            echo '<select',$id,$readonly,$hint,$class,' size="1">';
-            $value = $this->_form->getData($ctrl->ref);
-
-
-
-
+
+
+
+
+
+
+
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-                echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';
@@ -251 +249 @@
-                echo '<select name="',$ctrl->ref,'[]" id="',$this->_name,'_',$ctrl->ref,'"',$readonly,$hint,$class,' size="',$ctrl->size,'" multiple="multiple">';
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
-                    $value = $ctrl->selectedValues;
-                }
-
-                if(is_array($value) && count($value) == 1)
@@ -270 +265 @@
-            }else{
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
-                    $value = $ctrl->selectedValues;
-                }
-
-                if(is_array($value)){
@@ -290 +282 @@
-        case 'textarea':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<textarea',$id,$readonly,$hint,$class,'>',htmlspecialchars($value),'</textarea>';
-            break;
@@ -300 +290 @@
-        case 'output':
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null)
-                $value = $ctrl->defaultValue;
-            echo '<input type="hidden"',$id,' value="',htmlspecialchars($value),'"',$this->_endt;
-            echo '<span class="jforms-value"',$hint,'>',htmlspecialchars($value),'</span>';

branches/1.0beta3.x/lib/jelix/forms/jFormsCompiler.class.php

@@ -210 +210 @@
-                        $str.="'". str_replace("'","\\'", (string)$value) ."',";
-                    }
-selectedValues
+defaultValue
-                    $hasSelectedValues = true;
-                }elseif(isset($control['selectedvalue'])){
-selectedValues
+defaultValue
-                    $hasSelectedValues = true;
-                }
@@ -264 +264 @@
-                            throw new jException('jelix~formserr.multiple.selected.not.allowed',$this->sourceFile);
-                        }
-selectedValues
+defaultValue
-                    }
-                }else{
@@ -290 +290 @@
-                    if($alertRequired!='')
-                        $source[]='$ctrl2->alertRequired = $ctrl->alertRequired;';
-
+
-                    if(isset($control->help)){
-                        $source[]='$ctrl2->hasHelp=true;';

branches/1.0beta3.x/lib/jelix/forms/jFormsCompiler.class.php

@@ -210 +210 @@
-                        $str.="'". str_replace("'","\\'", (string)$value) ."',";
-                    }
-selectedValues
+defaultValue
-                    $hasSelectedValues = true;
-                }elseif(isset($control['selectedvalue'])){
-selectedValues
+defaultValue
-                    $hasSelectedValues = true;
-                }
@@ -264 +264 @@
-                            throw new jException('jelix~formserr.multiple.selected.not.allowed',$this->sourceFile);
-                        }
-selectedValues
+defaultValue
-                    }
-                }else{
@@ -290 +290 @@
-                    if($alertRequired!='')
-                        $source[]='$ctrl2->alertRequired = $ctrl->alertRequired;';
-
+
-                    if(isset($control->help)){
-                        $source[]='$ctrl2->hasHelp=true;';

branches/1.0beta3.x/lib/jelix/forms/jFormsControl.class.php

@@ -28 +28 @@
-    public $readonly = false;
-    public $label='';
-v
+defaultV
-    public $hasHelp = false;
-    public $hint='';
@@ -71 +71 @@
-     */
-    public $datasource;
-selectedValues
+defaultValue
-
-    function getDisplayValue($value){
@@ -93 +93 @@
-class jFormsControlInput extends jFormsControl {
-    public $type='input';
-    public $defaultValue='';
-}
-
@@ -195 +194 @@
-class jFormsControlTextarea extends jFormsControl {
-    public $type='textarea';
-    public $defaultValue='';
-}
-
@@ -247 +245 @@
-class jFormsControlOutput extends jFormsControl {
-    public $type='output';
-    public $defaultValue='';
-
-    public function check($value, $form){

branches/1.0beta3.x/lib/jelix/forms/jFormsControl.class.php

@@ -28 +28 @@
-    public $readonly = false;
-    public $label='';
-v
+defaultV
-    public $hasHelp = false;
-    public $hint='';
@@ -71 +71 @@
-     */
-    public $datasource;
-selectedValues
+defaultValue
-
-    function getDisplayValue($value){
@@ -93 +93 @@
-class jFormsControlInput extends jFormsControl {
-    public $type='input';
-    public $defaultValue='';
-}
-
@@ -195 +194 @@
-class jFormsControlTextarea extends jFormsControl {
-    public $type='textarea';
-    public $defaultValue='';
-}
-
@@ -247 +245 @@
-class jFormsControlOutput extends jFormsControl {
-    public $type='output';
-    public $defaultValue='';
-
-    public function check($value, $form){

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.compiler.html.php

@@ -422 +422 @@
-\'ccc\'=>\'ccc\',
-);
-selectedValues
+defaultValue
-  0 => \'aaa\',
-);
@@ -434 +434 @@
-\'ccc\'=>\'ccc\',
-);
-selectedValues
+defaultValue
-  0 => \'aaa\',
-  1 => \'ccc\',
@@ -442 +442 @@
-40=>'$ctrl= new jFormsControllistbox(\'nom\');
-$ctrl->label=\'Votre nom\';
-selectedValues
+defaultValue
-$ctrl->datasource= new jFormStaticDatasource();
-$ctrl->datasource->datas = array(
@@ -453 +453 @@
-41=>'$ctrl= new jFormsControllistbox(\'nom\');
-$ctrl->label=\'Votre nom\';
-selectedValues
+defaultValue
-$ctrl->datasource= new jFormStaticDatasource();
-$ctrl->datasource->datas = array(

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.compiler.html.php

@@ -422 +422 @@
-\'ccc\'=>\'ccc\',
-);
-selectedValues
+defaultValue
-  0 => \'aaa\',
-);
@@ -434 +434 @@
-\'ccc\'=>\'ccc\',
-);
-selectedValues
+defaultValue
-  0 => \'aaa\',
-  1 => \'ccc\',
@@ -442 +442 @@
-40=>'$ctrl= new jFormsControllistbox(\'nom\');
-$ctrl->label=\'Votre nom\';
-selectedValues
+defaultValue
-$ctrl->datasource= new jFormStaticDatasource();
-$ctrl->datasource->datas = array(
@@ -453 +453 @@
-41=>'$ctrl= new jFormsControllistbox(\'nom\');
-$ctrl->label=\'Votre nom\';
-selectedValues
+defaultValue
-$ctrl->datasource= new jFormStaticDatasource();
-$ctrl->datasource->datas = array(

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.html.php

@@ -42 +42 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -77 +77 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -186 +186 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -226 +226 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.html.php

@@ -42 +42 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -77 +77 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -186 +186 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>
@@ -226 +226 @@
-            <boolean property="readonly" value="false"/>
-            <string property="label" value="product name"/>
-v
-
-
-
-
-
-
-v
+defaultV
+
+
+
+
+
+
+defaultV
-        </object>
-    </array>

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

@@ -18 +18 @@
-class testHMLForm { // simulate a jFormBase object
-    public $controls= array();
+    public $submits= array();
+    public $uploads= array();
-    public $container;
-
+    protected $datas =  array( 'chk'=>'1', 'chk2'=>'', 'choixsimple'=>'11', 'choixmultiple'=>array('10','23'));
-    function __construct(){
-        $this->container = new jFormsDataContainer('','');
@@ -25 +28 @@
-
-    function getData($name) {
-
-
-
+
+
-        else
-            return null;
-    }
+    function setData($name,$value) {
+        $this->datas[$name]=$value;
+    }
-    function getControls() {
-        return $this->controls;
@@ -39 +44 @@
-    function hasUpload(){
-       return false;
+    }
+    function addControl($control){
+        $this->controls [$control->ref] = $control;
+        if($control->type =='submit')
+            $this->submits [$control->ref] = $control;
+        if($control->type =='upload'){
+            $this->uploads [$control->ref] = $control;
+        }
+        $this->datas[$control->ref] = $control->defaultValue;
-    }
-}
@@ -51 +65 @@
-class UTjformsHTMLBuilder extends jUnitTestCaseDb {
-
+    protected $form;
-    protected $builder;
-    function testStart() {
-
-
+this->
+this->
-        $this->formname = $this->builder->getName();
-    }
@@ -105 +120 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value=""/>', $out);
+
+        $this->form->addControl($ctrl);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value=""/>', $out);
+
+        $this->form->setData('nom','toto');
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="toto"/>', $out);
+
+        $ctrl->defaultValue='laurent';
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="toto"/>', $out);
+
+        $this->form->addControl($ctrl);
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" value="laurent"/>', $out);
-
@@ -111 +142 @@
-        $this->assertEqualOrDiff('<input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" value="laurent"/>', $out);
-
-
-
-
-
-
-
-
+
-        $ctrl->hasHelp=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-inconnu" id="'.$this->formname.'_nominconnu" value="toto"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nominconnu
-
-
-
-inconnu
-
-
-inconnu" id="'.$this->formname.'_nominconnu" title="ceci est un tooltip" value="toto"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nominconnu
+" id="'.$this->formname.'_nom" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom
+
+
+
+
+
+
+" id="'.$this->formname.'_nom" title="ceci est un tooltip" value="laurent"/><span class="jforms-help"><a href="javascript:jForms.showHelp(\''. $this->formname.'\',\'nom
-
-    }
@@ -134 +159 @@
-        $ctrl->datatype= new jDatatypeString();
-        $ctrl->label='Une option';
+        $this->form->addControl($ctrl);
-
-        ob_start();$this->builder->outputControlLabel($ctrl);$out = ob_get_clean();
@@ -139 +165 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<input type="checkbox" name="chk" id="'.$this->formname.'_chk" value="1"/>', $out);
+
+        $this->form->setData('chk','1');
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="checkbox" name="chk" id="'.$this->formname.'_chk" checked="checked" value="1"/>', $out);
-
@@ -152 +182 @@
-
-        $ctrl->defaultValue='1';
+        $this->form->addControl($ctrl);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $this->assertEqualOrDiff('<input type="checkbox" name="chk2" id="'.$this->formname.'_chk2" checked="checked" value="1"/>', $out);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        $ctrl->readonly=true;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+