L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-39650-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2013-06-18 14:11:54 +10:00
parent d71021f601 e4b771cf0d
commit 3ad26c86eb
2 changed files with 78 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/formslib.php
+3 -5
View File
@@ -1079,11 +1079,9 @@ abstract class moodleform {
$params = array_merge(array($realelementname), $params);
call_user_func_array(array(&$mform, 'addRule'), $params);
break;
case 'type' :
//Type should be set only once
if (!isset($mform->_types[$elementname])) {
$mform->setType($elementname, $params);
}
case 'type':
$mform->setType($realelementname, $params);
break;
}
}
lib/tests/formslib_test.php
+75
View File
@@ -226,6 +226,24 @@ class formslib_testcase extends basic_testcase {
'xyz' => PARAM_RAW
),
1 => PARAM_INT
),
'repeatgroupel1' => array(
0 => PARAM_INT,
1 => PARAM_INT
),
'repeatgroupel2' => array(
0 => PARAM_INT,
1 => PARAM_INT
),
'repeatnamedgroup' => array(
0 => array(
'repeatnamedgroupel1' => PARAM_INT,
'repeatnamedgroupel2' => PARAM_INT
),
1 => array(
'repeatnamedgroupel1' => PARAM_INT,
'repeatnamedgroupel2' => PARAM_INT
)
)
);
$valuessubmitted = array(
@@ -262,6 +280,24 @@ class formslib_testcase extends basic_testcase {
'xyz' => '11.01'
),
1 => '11.01'
),
'repeatgroupel1' => array(
0 => '11.01',
1 => '11.01'
),
'repeatgroupel2' => array(
0 => '11.01',
1 => '11.01'
),
'repeatnamedgroup' => array(
0 => array(
'repeatnamedgroupel1' => '11.01',
'repeatnamedgroupel2' => '11.01'
),
1 => array(
'repeatnamedgroupel1' => '11.01',
'repeatnamedgroupel2' => '11.01'
)
)
);
$expectedvalues = array(
@@ -300,6 +336,26 @@ class formslib_testcase extends basic_testcase {
'xyz' => '11.01'
),
1 => 11
),
'repeatablegroup' => 2,
'repeatgroupel1' => array(
0 => 11,
1 => 11
),
'repeatgroupel2' => array(
0 => 11,
1 => 11
),
'repeatablenamedgroup' => 2,
'repeatnamedgroup' => array(
0 => array(
'repeatnamedgroupel1' => 11,
'repeatnamedgroupel2' => 11
),
1 => array(
'repeatnamedgroupel1' => 11,
'repeatnamedgroupel2' => 11
)
)
);
@@ -342,6 +398,7 @@ class formslib_test_form extends moodleform {
}
}
// Used to check value cleaning.
class formslib_clean_value extends moodleform {
public function get_form() {
return $this->_form;
@@ -407,5 +464,23 @@ class formslib_clean_value extends moodleform {
$mform->addElement('text', 'nested[1]', 'nested[1]');
$mform->addElement('text', 'nested[0][xyz]', 'nested[0][xyz]');
$mform->addElement('text', 'nested[0][bob][foo]', 'nested[0][bob][foo]');
// Add group in repeated element (with extra inheritance).
$groupelements = array(
$mform->createElement('text', 'repeatgroupel1', 'repeatgroupel1'),
$mform->createElement('text', 'repeatgroupel2', 'repeatgroupel2')
);
$group = $mform->createElement('group', 'repeatgroup', 'repeatgroup', $groupelements, null, false);
$this->repeat_elements(array($group), 2, array('repeatgroupel1' => array('type' => PARAM_INT),
'repeatgroupel2' => array('type' => PARAM_INT)), 'repeatablegroup', 'add', 0);
// Add named group in repeated element.
$groupelements = array(
$mform->createElement('text', 'repeatnamedgroupel1', 'repeatnamedgroupel1'),
$mform->createElement('text', 'repeatnamedgroupel2', 'repeatnamedgroupel2')
);
$group = $mform->createElement('group', 'repeatnamedgroup', 'repeatnamedgroup', $groupelements, null, true);
$this->repeat_elements(array($group), 2, array('repeatnamedgroup[repeatnamedgroupel1]' => array('type' => PARAM_INT),
'repeatnamedgroup[repeatnamedgroupel2]' => array('type' => PARAM_INT)), 'repeatablenamedgroup', 'add', 0);
}
}