Changeset 959
- Timestamp:
- 05/29/08 10:43:30 (6 months ago)
- Files:
-
- trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (6 diffs)
- trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (6 diffs)
- trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (6 diffs)
- trunk/lib/jelix/docs/ns/jforms_1.1.rng (modified) (6 diffs)
- trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (3 diffs)
- trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (3 diffs)
- trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (3 diffs)
- trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (3 diffs)
- trunk/lib/jelix/forms/jFormsDatasource.class.php (modified) (9 diffs)
- trunk/lib/jelix/forms/jFormsDatasource.class.php (modified) (9 diffs)
- trunk/lib/jelix/forms/jFormsDatasource.class.php (modified) (9 diffs)
- trunk/lib/jelix/forms/jFormsDatasource.class.php (modified) (9 diffs)
- trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.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.html_cli.php (modified) (2 diffs)
- trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix/docs/ns/jforms_1.1.rng
r907 r959 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <grammar 2 <grammar 3 3 xmlns="http://relaxng.org/ns/structure/1.0" 4 4 xmlns:ev="http://www.w3.org/2001/xml-events" … … 137 137 <!--<element name="storage"> 138 138 <attribute name="type"><choice><value>file</value><value>blob</value></choice></attribute> 139 <attribute name="value" /> 139 <attribute name="value" /> 140 140 </element> 141 141 --> 142 142 </element> 143 143 </define> 144 144 145 145 <define name="checkbox"> 146 146 <element name="checkbox"> … … 232 232 </optional> 233 233 </define> 234 234 235 235 <define name="UI.attr.readonly"> 236 236 <optional><attribute name="readonly"><choice><value>true</value><value>false</value></choice></attribute></optional> … … 242 242 <optional><attribute name="defaultvalue" /></optional> 243 243 </define> 244 244 245 245 <define name="attr.length"> 246 246 <optional><attribute name="minlength"><data type="integer" /></attribute></optional> … … 320 320 </choice> 321 321 </optional> 322 <optional><attribute name="profile" /></optional> 322 323 </group> 323 324 <attribute name="class" /> … … 394 395 395 396 --> 396 397 397 398 398 399 </grammar> trunk/lib/jelix/docs/ns/jforms_1.1.rng
r907 r959 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <grammar 2 <grammar 3 3 xmlns="http://relaxng.org/ns/structure/1.0" 4 4 xmlns:ev="http://www.w3.org/2001/xml-events" … … 137 137 <!--<element name="storage"> 138 138 <attribute name="type"><choice><value>file</value><value>blob</value></choice></attribute> 139 <attribute name="value" /> 139 <attribute name="value" /> 140 140 </element> 141 141 --> 142 142 </element> 143 143 </define> 144 144 145 145 <define name="checkbox"> 146 146 <element name="checkbox"> … … 232 232 </optional> 233 233 </define> 234 234 235 235 <define name="UI.attr.readonly"> 236 236 <optional><attribute name="readonly"><choice><value>true</value><value>false</value></choice></attribute></optional> … … 242 242 <optional><attribute name="defaultvalue" /></optional> 243 243 </define> 244 244 245 245 <define name="attr.length"> 246 246 <optional><attribute name="minlength"><data type="integer" /></attribute></optional> … … 320 320 </choice> 321 321 </optional> 322 <optional><attribute name="profile" /></optional> 322 323 </group> 323 324 <attribute name="class" /> … … 394 395 395 396 --> 396 397 397 398 398 399 </grammar> trunk/lib/jelix/docs/ns/jforms_1.1.rng
r907 r959 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <grammar 2 <grammar 3 3 xmlns="http://relaxng.org/ns/structure/1.0" 4 4 xmlns:ev="http://www.w3.org/2001/xml-events" … … 137 137 <!--<element name="storage"> 138 138 <attribute name="type"><choice><value>file</value><value>blob</value></choice></attribute> 139 <attribute name="value" /> 139 <attribute name="value" /> 140 140 </element> 141 141 --> 142 142 </element> 143 143 </define> 144 144 145 145 <define name="checkbox"> 146 146 <element name="checkbox"> … … 232 232 </optional> 233 233 </define> 234 234 235 235 <define name="UI.attr.readonly"> 236 236 <optional><attribute name="readonly"><choice><value>true</value><value>false</value></choice></attribute></optional> … … 242 242 <optional><attribute name="defaultvalue" /></optional> 243 243 </define> 244 244 245 245 <define name="attr.length"> 246 246 <optional><attribute name="minlength"><data type="integer" /></attribute></optional> … … 320 320 </choice> 321 321 </optional> 322 <optional><attribute name="profile" /></optional> 322 323 </group> 323 324 <attribute name="class" /> … … 394 395 395 396 --> 396 397 397 398 398 399 </grammar> trunk/lib/jelix/docs/ns/jforms_1.1.rng
r907 r959 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <grammar 2 <grammar 3 3 xmlns="http://relaxng.org/ns/structure/1.0" 4 4 xmlns:ev="http://www.w3.org/2001/xml-events" … … 137 137 <!--<element name="storage"> 138 138 <attribute name="type"><choice><value>file</value><value>blob</value></choice></attribute> 139 <attribute name="value" /> 139 <attribute name="value" /> 140 140 </element> 141 141 --> 142 142 </element> 143 143 </define> 144 144 145 145 <define name="checkbox"> 146 146 <element name="checkbox"> … … 232 232 </optional> 233 233 </define> 234 234 235 235 <define name="UI.attr.readonly"> 236 236 <optional><attribute name="readonly"><choice><value>true</value><value>false</value></choice></attribute></optional> … … 242 242 <optional><attribute name="defaultvalue" /></optional> 243 243 </define> 244 244 245 245 <define name="attr.length"> 246 246 <optional><attribute name="minlength"><data type="integer" /></attribute></optional> … … 320 320 </choice> 321 321 </optional> 322 <optional><attribute name="profile" /></optional> 322 323 </group> 323 324 <attribute name="class" /> … … 394 395 395 396 --> 396 397 397 398 398 399 </grammar> trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php
r907 r959 7 7 * @contributor Uriel Corfa Emotic SARL 8 8 * @copyright 2006-2008 Laurent Jouanneau 9 * @copyright 2007 Loic Mathaud, 2007 Dominique Papin9 * @copyright 2007 Loic Mathaud, 2007-2008 Dominique Papin 10 10 * @copyright 2007 Emotic SARL 11 11 * @link http://www.jelix.org … … 102 102 103 103 if(isset($attrs['dao'])) { 104 if ( isset($attrs['profile'])) 105 $profile = '\''.$attrs['profile'].'\''; 106 else 107 $profile = '\'\''; 104 108 if(isset($attrs['valueproperty'])) { 105 109 $daovalue = $attrs['valueproperty']; … … 119 123 120 124 $source[]='$ctrl->datasource = new jFormsDaoDatasource(\''.$attrs['dao'].'\',\''. 121 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\''.$criteria.');';125 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\','.$profile.$criteria.');'; 122 126 if($controltype == 'submit'){ 123 127 $source[]='$ctrl->standalone=false;'; trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php
r907 r959 7 7 * @contributor Uriel Corfa Emotic SARL 8 8 * @copyright 2006-2008 Laurent Jouanneau 9 * @copyright 2007 Loic Mathaud, 2007 Dominique Papin9 * @copyright 2007 Loic Mathaud, 2007-2008 Dominique Papin 10 10 * @copyright 2007 Emotic SARL 11 11 * @link http://www.jelix.org … … 102 102 103 103 if(isset($attrs['dao'])) { 104 if ( isset($attrs['profile'])) 105 $profile = '\''.$attrs['profile'].'\''; 106 else 107 $profile = '\'\''; 104 108 if(isset($attrs['valueproperty'])) { 105 109 $daovalue = $attrs['valueproperty']; … … 119 123 120 124 $source[]='$ctrl->datasource = new jFormsDaoDatasource(\''.$attrs['dao'].'\',\''. 121 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\''.$criteria.');';125 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\','.$profile.$criteria.');'; 122 126 if($controltype == 'submit'){ 123 127 $source[]='$ctrl->standalone=false;'; trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php
r907 r959 7 7 * @contributor Uriel Corfa Emotic SARL 8 8 * @copyright 2006-2008 Laurent Jouanneau 9 * @copyright 2007 Loic Mathaud, 2007 Dominique Papin9 * @copyright 2007 Loic Mathaud, 2007-2008 Dominique Papin 10 10 * @copyright 2007 Emotic SARL 11 11 * @link http://www.jelix.org … … 102 102 103 103 if(isset($attrs['dao'])) { 104 if ( isset($attrs['profile'])) 105 $profile = '\''.$attrs['profile'].'\''; 106 else 107 $profile = '\'\''; 104 108 if(isset($attrs['valueproperty'])) { 105 109 $daovalue = $attrs['valueproperty']; … … 119 123 120 124 $source[]='$ctrl->datasource = new jFormsDaoDatasource(\''.$attrs['dao'].'\',\''. 121 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\''.$criteria.');';125 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\','.$profile.$criteria.');'; 122 126 if($controltype == 'submit'){ 123 127 $source[]='$ctrl->standalone=false;'; trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php
r907 r959 7 7 * @contributor Uriel Corfa Emotic SARL 8 8 * @copyright 2006-2008 Laurent Jouanneau 9 * @copyright 2007 Loic Mathaud, 2007 Dominique Papin9 * @copyright 2007 Loic Mathaud, 2007-2008 Dominique Papin 10 10 * @copyright 2007 Emotic SARL 11 11 * @link http://www.jelix.org … … 102 102 103 103 if(isset($attrs['dao'])) { 104 if ( isset($attrs['profile'])) 105 $profile = '\''.$attrs['profile'].'\''; 106 else 107 $profile = '\'\''; 104 108 if(isset($attrs['valueproperty'])) { 105 109 $daovalue = $attrs['valueproperty']; … … 119 123 120 124 $source[]='$ctrl->datasource = new jFormsDaoDatasource(\''.$attrs['dao'].'\',\''. 121 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\''.$criteria.');';125 $attrs['method'].'\',\''.$attrs['labelproperty'].'\',\''.$daovalue.'\','.$profile.$criteria.');'; 122 126 if($controltype == 'submit'){ 123 127 $source[]='$ctrl->standalone=false;'; trunk/lib/jelix/forms/jFormsDatasource.class.php
r895 r959 4 4 * @subpackage forms 5 5 * @author Laurent Jouanneau 6 * @contributor 6 * @contributor Dominique Papin 7 7 * @copyright 2006-2007 Laurent Jouanneau 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file … … 18 19 interface jIFormsDatasource { 19 20 /** 20 * load and returns data to fill a control. The returned array should be 21 * load and returns data to fill a control. The returned array should be 21 22 * an associative array key => label 22 23 * @param jFormsBase $form the form … … 27 28 /** 28 29 * Return the label corresponding to the given key 29 * @param string $key the key 30 * @param string $key the key 30 31 * @return string the label 31 32 */ … … 80 81 protected $labelProperty; 81 82 protected $keyProperty; 83 protected $profile; 82 84 83 85 protected $criteria; … … 86 88 protected $dao = null; 87 89 88 function __construct ($selector ,$method , $label, $key, $ criteria=null, $criteriaFrom=null){90 function __construct ($selector ,$method , $label, $key, $profile='', $criteria=null, $criteriaFrom=null){ 89 91 $this->selector = $selector; 92 $this->profile = $profile; 90 93 $this->method = $method ; 91 94 $this->labelProperty = $label; … … 93 96 $this->criteriaFrom = $criteriaFrom; 94 97 if($key == ''){ 95 $rec = jDao::createRecord($this->selector );98 $rec = jDao::createRecord($this->selector, $this->profile); 96 99 $pfields = $rec->getPrimaryKeyNames(); 97 100 $key = $pfields[0]; … … 102 105 public function getData($form){ 103 106 if($this->dao === null) 104 $this->dao = jDao::get($this->selector );107 $this->dao = jDao::get($this->selector, $this->profile); 105 108 if($this->criteria !== null) { 106 109 $found = $this->dao->{$this->method}($this->criteria); … … 118 121 119 122 public function getLabel($key){ 120 if($this->dao === null) $this->dao = jDao::get($this->selector );123 if($this->dao === null) $this->dao = jDao::get($this->selector, $this->profile); 121 124 $rec = $this->dao->get($key); 122 125 if($rec) … … 127 130 128 131 } 129 trunk/lib/jelix/forms/jFormsDatasource.class.php
r895 r959 4 4 * @subpackage forms 5 5 * @author Laurent Jouanneau 6 * @contributor 6 * @contributor Dominique Papin 7 7 * @copyright 2006-2007 Laurent Jouanneau 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file … … 18 19 interface jIFormsDatasource { 19 20 /** 20 * load and returns data to fill a control. The returned array should be 21 * load and returns data to fill a control. The returned array should be 21 22 * an associative array key => label 22 23 * @param jFormsBase $form the form … … 27 28 /** 28 29 * Return the label corresponding to the given key 29 * @param string $key the key 30 * @param string $key the key 30 31 * @return string the label 31 32 */ … … 80 81 protected $labelProperty; 81 82 protected $keyProperty; 83 protected $profile; 82 84 83 85 protected $criteria; … … 86 88 protected $dao = null; 87 89 88 function __construct ($selector ,$method , $label, $key, $ criteria=null, $criteriaFrom=null){90 function __construct ($selector ,$method , $label, $key, $profile='', $criteria=null, $criteriaFrom=null){ 89 91 $this->selector = $selector; 92 $this->profile = $profile; 90 93 $this->method = $method ; 91 94 $this->labelProperty = $label; … … 93 96 $this->criteriaFrom = $criteriaFrom; 94 97 if($key == ''){ 95 $rec = jDao::createRecord($this->selector );98 $rec = jDao::createRecord($this->selector, $this->profile); 96 99 $pfields = $rec->getPrimaryKeyNames(); 97 100 $key = $pfields[0]; … … 102 105 public function getData($form){ 103 106 if($this->dao === null) 104 $this->dao = jDao::get($this->selector );107 $this->dao = jDao::get($this->selector, $this->profile); 105 108 if($this->criteria !== null) { 106 109 $found = $this->dao->{$this->method}($this->criteria); … … 118 121 119 122 public function getLabel($key){ 120 if($this->dao === null) $this->dao = jDao::get($this->selector );123 if($this->dao === null) $this->dao = jDao::get($this->selector, $this->profile); 121 124 $rec = $this->dao->get($key); 122 125 if($rec) … … 127 130 128 131 } 129 trunk/lib/jelix/forms/jFormsDatasource.class.php
r895 r959 4 4 * @subpackage forms 5 5 * @author Laurent Jouanneau 6 * @contributor 6 * @contributor Dominique Papin 7 7 * @copyright 2006-2007 Laurent Jouanneau 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file … … 18 19 interface jIFormsDatasource { 19 20 /** 20 * load and returns data to fill a control. The returned array should be 21 * load and returns data to fill a control. The returned array should be 21 22 * an associative array key => label 22 23 * @param jFormsBase $form the form … … 27 28 /** 28 29 * Return the label corresponding to the given key 29 * @param string $key the key 30 * @param string $key the key 30 31 * @return string the label 31 32 */ … … 80 81 protected $labelProperty; 81 82 protected $keyProperty; 83 protected $profile; 82 84 83 85 protected $criteria; … … 86 88 protected $dao = null; 87 89 88 function __construct ($selector ,$method , $label, $key, $ criteria=null, $criteriaFrom=null){90 function __construct ($selector ,$method , $label, $key, $profile='', $criteria=null, $criteriaFrom=null){ 89 91 $this->selector = $selector; 92 $this->profile = $profile; 90 93 $this->method = $method ; 91 94 $this->labelProperty = $label; … … 93 96 $this->criteriaFrom = $criteriaFrom; 94 97 if($key == ''){ 95 $rec = jDao::createRecord($this->selector );98 $rec = jDao::createRecord($this->selector, $this->profile); 96 99 $pfields = $rec->getPrimaryKeyNames(); 97 100 $key = $pfields[0]; … … 102 105 public function getData($form){ 103 106 if($this->dao === null) 104 $this->dao = jDao::get($this->selector );107 $this->dao = jDao::get($this->selector, $this->profile); 105 108 if($this->criteria !== null) { 106 109 $found = $this->dao->{$this->method}($this->criteria); … … 118 121 119 122 public function getLabel($key){ 120 if($this->dao === null) $this->dao = jDao::get($this->selector );123 if($this->dao === null) $this->dao = jDao::get($this->selector, $this->profile); 121 124 $rec = $this->dao->get($key); 122 125 if($rec) … … 127 130 128 131 } 129 trunk/lib/jelix/forms/jFormsDatasource.class.php
r895 r959 4 4 * @subpackage forms 5 5 * @author Laurent Jouanneau 6 * @contributor 6 * @contributor Dominique Papin 7 7 * @copyright 2006-2007 Laurent Jouanneau 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file … … 18 19 interface jIFormsDatasource { 19 20 /** 20 * load and returns data to fill a control. The returned array should be 21 * load and returns data to fill a control. The returned array should be 21 22 * an associative array key => label 22 23 * @param jFormsBase $form the form … … 27 28 /** 28 29 * Return the label corresponding to the given key 29 * @param string $key the key 30 * @param string $key the key 30 31 * @return string the label 31 32 */ … … 80 81 protected $labelProperty; 81 82 protected $keyProperty; 83 protected $profile; 82 84 83 85 protected $criteria; … … 86 88 protected $dao = null; 87 89 88 function __construct ($selector ,$method , $label, $key, $ criteria=null, $criteriaFrom=null){90 function __construct ($selector ,$method , $label, $key, $profile='', $criteria=null, $criteriaFrom=null){ 89 91 $this->selector = $selector; 92 $this->profile = $profile; 90 93 $this->method = $method ; 91 94 $this->labelProperty = $label; … … 93 96 $this->criteriaFrom = $criteriaFrom; 94 97 if($key == ''){ 95 $rec = jDao::createRecord($this->selector );98 $rec = jDao::createRecord($this->selector, $this->profile); 96 99 $pfields = $rec->getPrimaryKeyNames(); 97 100 $key = $pfields[0]; … … 102 105 public function getData($form){ 103 106 if($this->dao === null) 104 $this->dao = jDao::get($this->selector );107 $this->dao = jDao::get($this->selector, $this->profile); 105 108 if($this->criteria !== null) { 106 109 $found = $this->dao->{$this->method}($this->criteria); … … 118 121 119 122 public function getLabel($key){ 120 if($this->dao === null) $this->dao = jDao::get($this->selector );123 if($this->dao === null) $this->dao = jDao::get($this->selector, $this->profile); 121 124 $rec = $this->dao->get($key); 122 125 if($rec) … … 127 130 128 131 } 129 trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php
r907 r959 351 351 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteria="toto"/> 352 352 </listbox>', 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 354 <label>Votre nom</label> 355 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" profile="youp" criteria="toto"/> 356 </listbox>', 357 81=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 354 358 <label>Votre nom</label> 355 359 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteriafrom="prenom"/> 356 360 </listbox>', 357 8 1=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1">361 82=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 358 362 <label>Votre nom</label> 359 363 <datasource class="jelix_tests~mydatasource"/> … … 741 745 74=>'$ctrl= new jFormsControlcheckboxes(\'nom\'); 742 746 $ctrl->label=\'Votre nom\'; 743 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 744 748 $this->addControl($ctrl);', 745 749 75=>'$ctrl= new jFormsControlradiobuttons(\'nom\'); 746 750 $ctrl->label=\'Votre nom\'; 747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 748 752 $this->addControl($ctrl);', 749 753 76=>'$ctrl= new jFormsControllistbox(\'nom\'); 750 754 $ctrl->label=\'Votre nom\'; 751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 752 756 $this->addControl($ctrl);', 753 757 77=>'$ctrl= new jFormsControlmenulist(\'nom\'); 754 758 $ctrl->label=\'Votre nom\'; 755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 756 760 $this->addControl($ctrl);', 757 761 78=>'$ctrl= new jFormsControllistbox(\'nom\'); 758 762 $ctrl->label=\'Votre nom\'; 759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );763 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 760 764 $ctrl->multiple=true; 761 765 $this->addControl($ctrl);', 762 766 79=>'$ctrl= new jFormsControllistbox(\'nom\'); 763 767 $ctrl->label=\'Votre nom\'; 764 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\' toto\');768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',\'toto\'); 765 769 $this->addControl($ctrl);', 766 770 80=>'$ctrl= new jFormsControllistbox(\'nom\'); 767 771 $ctrl->label=\'Votre nom\'; 768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',null,\'prenom\'); 772 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'youp\',\'toto\'); 773 $this->addControl($ctrl);', 774 81=>'$ctrl= new jFormsControllistbox(\'nom\'); 775 $ctrl->label=\'Votre nom\'; 776 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',null,\'prenom\'); 769 777 $ctrl->multiple=true; 770 778 $this->addControl($ctrl);', 771 8 1=>'$ctrl= new jFormsControlmenulist(\'nom\');779 82=>'$ctrl= new jFormsControlmenulist(\'nom\'); 772 780 $ctrl->label=\'Votre nom\'; 773 781 jClasses::inc(\'jelix_tests~mydatasource\'); trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php
r907 r959 351 351 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteria="toto"/> 352 352 </listbox>', 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 354 <label>Votre nom</label> 355 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" profile="youp" criteria="toto"/> 356 </listbox>', 357 81=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 354 358 <label>Votre nom</label> 355 359 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteriafrom="prenom"/> 356 360 </listbox>', 357 8 1=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1">361 82=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 358 362 <label>Votre nom</label> 359 363 <datasource class="jelix_tests~mydatasource"/> … … 741 745 74=>'$ctrl= new jFormsControlcheckboxes(\'nom\'); 742 746 $ctrl->label=\'Votre nom\'; 743 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 744 748 $this->addControl($ctrl);', 745 749 75=>'$ctrl= new jFormsControlradiobuttons(\'nom\'); 746 750 $ctrl->label=\'Votre nom\'; 747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 748 752 $this->addControl($ctrl);', 749 753 76=>'$ctrl= new jFormsControllistbox(\'nom\'); 750 754 $ctrl->label=\'Votre nom\'; 751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 752 756 $this->addControl($ctrl);', 753 757 77=>'$ctrl= new jFormsControlmenulist(\'nom\'); 754 758 $ctrl->label=\'Votre nom\'; 755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 756 760 $this->addControl($ctrl);', 757 761 78=>'$ctrl= new jFormsControllistbox(\'nom\'); 758 762 $ctrl->label=\'Votre nom\'; 759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );763 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 760 764 $ctrl->multiple=true; 761 765 $this->addControl($ctrl);', 762 766 79=>'$ctrl= new jFormsControllistbox(\'nom\'); 763 767 $ctrl->label=\'Votre nom\'; 764 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\' toto\');768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',\'toto\'); 765 769 $this->addControl($ctrl);', 766 770 80=>'$ctrl= new jFormsControllistbox(\'nom\'); 767 771 $ctrl->label=\'Votre nom\'; 768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',null,\'prenom\'); 772 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'youp\',\'toto\'); 773 $this->addControl($ctrl);', 774 81=>'$ctrl= new jFormsControllistbox(\'nom\'); 775 $ctrl->label=\'Votre nom\'; 776 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',null,\'prenom\'); 769 777 $ctrl->multiple=true; 770 778 $this->addControl($ctrl);', 771 8 1=>'$ctrl= new jFormsControlmenulist(\'nom\');779 82=>'$ctrl= new jFormsControlmenulist(\'nom\'); 772 780 $ctrl->label=\'Votre nom\'; 773 781 jClasses::inc(\'jelix_tests~mydatasource\'); trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php
r907 r959 351 351 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteria="toto"/> 352 352 </listbox>', 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 354 <label>Votre nom</label> 355 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" profile="youp" criteria="toto"/> 356 </listbox>', 357 81=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 354 358 <label>Votre nom</label> 355 359 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteriafrom="prenom"/> 356 360 </listbox>', 357 8 1=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1">361 82=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 358 362 <label>Votre nom</label> 359 363 <datasource class="jelix_tests~mydatasource"/> … … 741 745 74=>'$ctrl= new jFormsControlcheckboxes(\'nom\'); 742 746 $ctrl->label=\'Votre nom\'; 743 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 744 748 $this->addControl($ctrl);', 745 749 75=>'$ctrl= new jFormsControlradiobuttons(\'nom\'); 746 750 $ctrl->label=\'Votre nom\'; 747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 748 752 $this->addControl($ctrl);', 749 753 76=>'$ctrl= new jFormsControllistbox(\'nom\'); 750 754 $ctrl->label=\'Votre nom\'; 751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 752 756 $this->addControl($ctrl);', 753 757 77=>'$ctrl= new jFormsControlmenulist(\'nom\'); 754 758 $ctrl->label=\'Votre nom\'; 755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 756 760 $this->addControl($ctrl);', 757 761 78=>'$ctrl= new jFormsControllistbox(\'nom\'); 758 762 $ctrl->label=\'Votre nom\'; 759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );763 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 760 764 $ctrl->multiple=true; 761 765 $this->addControl($ctrl);', 762 766 79=>'$ctrl= new jFormsControllistbox(\'nom\'); 763 767 $ctrl->label=\'Votre nom\'; 764 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\' toto\');768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',\'toto\'); 765 769 $this->addControl($ctrl);', 766 770 80=>'$ctrl= new jFormsControllistbox(\'nom\'); 767 771 $ctrl->label=\'Votre nom\'; 768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',null,\'prenom\'); 772 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'youp\',\'toto\'); 773 $this->addControl($ctrl);', 774 81=>'$ctrl= new jFormsControllistbox(\'nom\'); 775 $ctrl->label=\'Votre nom\'; 776 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',null,\'prenom\'); 769 777 $ctrl->multiple=true; 770 778 $this->addControl($ctrl);', 771 8 1=>'$ctrl= new jFormsControlmenulist(\'nom\');779 82=>'$ctrl= new jFormsControlmenulist(\'nom\'); 772 780 $ctrl->label=\'Votre nom\'; 773 781 jClasses::inc(\'jelix_tests~mydatasource\'); trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php
r907 r959 351 351 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteria="toto"/> 352 352 </listbox>', 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 353 80=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 354 <label>Votre nom</label> 355 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" profile="youp" criteria="toto"/> 356 </listbox>', 357 81=>'<listbox ref="nom" xmlns="http://jelix.org/ns/forms/1.1" multiple="true"> 354 358 <label>Votre nom</label> 355 359 <datasource dao="foo" method="bar" labelproperty="baz" valueproperty="plop" criteriafrom="prenom"/> 356 360 </listbox>', 357 8 1=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1">361 82=>'<menulist ref="nom" xmlns="http://jelix.org/ns/forms/1.1"> 358 362 <label>Votre nom</label> 359 363 <datasource class="jelix_tests~mydatasource"/> … … 741 745 74=>'$ctrl= new jFormsControlcheckboxes(\'nom\'); 742 746 $ctrl->label=\'Votre nom\'; 743 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 744 748 $this->addControl($ctrl);', 745 749 75=>'$ctrl= new jFormsControlradiobuttons(\'nom\'); 746 750 $ctrl->label=\'Votre nom\'; 747 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 748 752 $this->addControl($ctrl);', 749 753 76=>'$ctrl= new jFormsControllistbox(\'nom\'); 750 754 $ctrl->label=\'Votre nom\'; 751 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 752 756 $this->addControl($ctrl);', 753 757 77=>'$ctrl= new jFormsControlmenulist(\'nom\'); 754 758 $ctrl->label=\'Votre nom\'; 755 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 756 760 $this->addControl($ctrl);', 757 761 78=>'$ctrl= new jFormsControllistbox(\'nom\'); 758 762 $ctrl->label=\'Votre nom\'; 759 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\' );763 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\'); 760 764 $ctrl->multiple=true; 761 765 $this->addControl($ctrl);', 762 766 79=>'$ctrl= new jFormsControllistbox(\'nom\'); 763 767 $ctrl->label=\'Votre nom\'; 764 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\' toto\');768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',\'toto\'); 765 769 $this->addControl($ctrl);', 766 770 80=>'$ctrl= new jFormsControllistbox(\'nom\'); 767 771 $ctrl->label=\'Votre nom\'; 768 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',null,\'prenom\'); 772 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'youp\',\'toto\'); 773 $this->addControl($ctrl);', 774 81=>'$ctrl= new jFormsControllistbox(\'nom\'); 775 $ctrl->label=\'Votre nom\'; 776 $ctrl->datasource = new jFormsDaoDatasource(\'foo\',\'bar\',\'baz\',\'plop\',\'\',null,\'prenom\'); 769 777 $ctrl->multiple=true; 770 778 $this->addControl($ctrl);', 771 8 1=>'$ctrl= new jFormsControlmenulist(\'nom\');779 82=>'$ctrl= new jFormsControlmenulist(\'nom\'); 772 780 $ctrl->label=\'Votre nom\'; 773 781 jClasses::inc(\'jelix_tests~mydatasource\');