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

MDL-55804 forms: Return exported data through _prepareValue

Browse Source
This commit is contained in:
David Monllao
2016-09-27 08:12:08 +08:00
parent 6aec209125
commit 8b27687b5f
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/tests/calendartype_test.php
+1 -1
View File
@@ -224,7 +224,7 @@ class core_calendar_type_testcase extends advanced_testcase {
$el->_createElements();
$submitvalues = array('dateselector' => $date);
$this->assertSame($el->exportValue($submitvalues), array('dateselector' => $date['timestamp']));
$this->assertSame(array('dateselector' => $date['timestamp']), $el->exportValue($submitvalues, true));
}
/**
lib/form/dateselector.php
+3 -5
View File
@@ -262,7 +262,6 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group {
* @return array
*/
function exportValue(&$submitValues, $assoc = false) {
$value = null;
$valuearray = array();
foreach ($this->_elements as $element){
$thisexport = $element->exportValue($submitValues[$this->getName()], true);
@@ -274,21 +273,20 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group {
if($this->_options['optional']) {
// If checkbox is on, the value is zero, so go no further
if(empty($valuearray['enabled'])) {
$value[$this->getName()] = 0;
return $value;
return $this->_prepareValue(0, $assoc);
}
}
// Get the calendar type used - see MDL-18375.
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($valuearray['year'], $valuearray['month'], $valuearray['day']);
$value[$this->getName()] = make_timestamp($gregoriandate['year'],
$value = make_timestamp($gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
0, 0, 0,
$this->_options['timezone'],
true);
return $value;
return $this->_prepareValue($value, $assoc);
} else {
return null;
}
lib/form/datetimeselector.php
+3 -5
View File
@@ -285,7 +285,6 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
* @return array
*/
function exportValue(&$submitValues, $assoc = false) {
$value = null;
$valuearray = array();
foreach ($this->_elements as $element){
$thisexport = $element->exportValue($submitValues[$this->getName()], true);
@@ -297,8 +296,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
if($this->_options['optional']) {
// If checkbox is on, the value is zero, so go no further
if(empty($valuearray['enabled'])) {
$value[$this->getName()] = 0;
return $value;
return $this->_prepareValue(0, $assoc);
}
}
// Get the calendar type used - see MDL-18375.
@@ -308,7 +306,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
$valuearray['day'],
$valuearray['hour'],
$valuearray['minute']);
$value[$this->getName()] = make_timestamp($gregoriandate['year'],
$value = make_timestamp($gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
$gregoriandate['hour'],
@@ -317,7 +315,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
$this->_options['timezone'],
true);
return $value;
return $this->_prepareValue($value, $assoc);
} else {
return null;
}
lib/form/tests/dateselector_test.php
+1 -1
View File
@@ -133,7 +133,7 @@ class core_form_dateselector_testcase extends advanced_testcase {
$el->_createElements();
$submitvalues = array('dateselector' => $vals);
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues),
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues, true),
"Please check if timezones are updated (Site adminstration -> location -> update timezone)");
}
}
lib/form/tests/datetimeselector_test.php
+1 -1
View File
@@ -145,7 +145,7 @@ class core_form_datetimeselector_testcase extends advanced_testcase {
$el->_createElements();
$submitvalues = array('dateselector' => $vals);
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues),
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues, true),
"Please check if timezones are updated (Site adminstration -> location -> update timezone)");
}
}