Changeset 1022

Show
Ignore:
Timestamp:
07/18/08 23:17:52 (5 months ago)
Author:
laurentj
Message:

ticket #641: jFormsControlDataSource should not define defaultValue=array as it is not valid on a menulist

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1020 r1022  
    66* @contributor Loic Mathaud, Dominique Papin 
    77* @contributor Uriel Corfa Emotic SARL 
    8 * @copyright   2006-2007 Laurent Jouanneau 
     8* @copyright   2006-2008 Laurent Jouanneau 
    99* @copyright   2007 Loic Mathaud, 2007 Dominique Papin 
    1010* @copyright   2007 Emotic SARL 

  • branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

    r994 r1022  
    412412            $hasSelectedValues = true; 
    413413        }elseif(isset($attributes['selectedvalue'])){ 
    414             $source[]='$ctrl->defaultValue=array(\''. str_replace("'","\\'", (string)$control['selectedvalue']) .'\');'; 
     414            if ($controltype == 'menulist' ||  $controltype == 'radiobuttons') { 
     415                $source[]='$ctrl->defaultValue=\''. str_replace("'","\\'", (string)$control['selectedvalue']) .'\';'; 
     416            } else { 
     417                $source[]='$ctrl->defaultValue=array(\''. str_replace("'","\\'", (string)$control['selectedvalue']) .'\');'; 
     418            } 
    415419            $hasSelectedValues = true; 
    416420            unset($attributes['selectedvalue']); 

  • branches/experimental/jforms-groups/lib/jelix/forms/jFormsControl.class.php

    r984 r1022  
    500500class jFormsControlRadiobuttons extends jFormsControlDatasource { 
    501501    public $type="radiobuttons"; 
    502  
     502    public $defaultValue=''; 
    503503    function check(){ 
    504504        if($this->container->data[$this->ref] == '' && $this->required) { 
    …… 
    516516class jFormsControlMenulist extends jFormsControlRadiobuttons { 
    517517    public $type="menulist"; 
     518    public $defaultValue=''; 
    518519} 
    519520 
Download in other formats: Unified Diff Zip Archive