mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-43648 form: fix hours and minutes in date_time_selector

Browse Source
This commit is contained in:
Ryan Wyllie 2018-01-10 02:28:19 +00:00
parent f1d1a60e0a
commit 9f421a184a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/form/defaultcustom.php
View File

@ -105,8 +105,8 @@ class MoodleQuickForm_defaultcustom extends MoodleQuickForm_group {
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$currentdate = $calendartype->timestamp_to_date_array($value, $this->_options['timezone']);
return array(
'minutes' => $currentdate['minutes'],
'hours' => $currentdate['hours'],
'minute' => $currentdate['minutes'],
'hour' => $currentdate['hours'],
'day' => $currentdate['mday'],
'month' => $currentdate['mon'],
'year' => $currentdate['year']);
@ -198,8 +198,8 @@ class MoodleQuickForm_defaultcustom extends MoodleQuickForm_group {
$caller->disabledIf($arg[0] . '[value][day]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][month]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][year]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][hours]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][minutes]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][hour]', $arg[0] . '[customize]', 'notchecked');
$caller->disabledIf($arg[0] . '[value][minute]', $arg[0] . '[customize]', 'notchecked');
}
}
return $rv;
@ -242,7 +242,7 @@ class MoodleQuickForm_defaultcustom extends MoodleQuickForm_group {
$firstelement = reset($this->_elements);
$defaultvalue = $this->_options['defaultvalue'];
$customvalue = $this->_options['customvalue'];
if ($this->_options['type'] === 'date_selector') {
if ($this->_options['type'] === 'date_selector' || $this->_options['type'] === 'date_time_selector') {
$defaultvalue = $this->timestamp_to_date_array($defaultvalue);
$customvalue = $this->timestamp_to_date_array($customvalue);
}