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

Merge branch 'MDL-85274-405' of https://github.com/davewoloszyn/moodle into MOODLE_405_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-06-11 13:30:18 +07:00
parent 812ef23c00 5dd77e0022
commit d83b08f92c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/classes/local/event/forms/create.php
+7 -2
View File
@@ -213,7 +213,8 @@ class create extends \moodleform {
$group[] = $mform->createElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
$group[] = $mform->createElement('date_time_selector', 'timedurationuntil', '');
$group[] = $mform->createElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2);
$group[] = $mform->createElement('text', 'timedurationminutes', get_string('durationminutes', 'calendar'));
$group[] = $mform->createElement('text', 'timedurationminutes',
get_string('durationminutes', 'calendar'), 'maxlength="7" size="7"');
$mform->addGroup($group, 'durationgroup', get_string('eventduration', 'calendar'), '<br />', false);
$mform->setAdvanced('durationgroup');
@@ -227,6 +228,9 @@ class create extends \moodleform {
$mform->setType('timedurationminutes', PARAM_INT);
$mform->disabledIf('timedurationminutes', 'duration', 'noteq', 2);
$mform->addGroupRule('durationgroup', [
'timedurationminutes' => [[get_string('maximumchars', '', 7), 'maxlength', 7, 'server']],
]);
$mform->setDefault('duration', 0);
}
@@ -238,11 +242,12 @@ class create extends \moodleform {
*/
protected function add_event_repeat_elements($mform) {
$mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null);
$mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
$mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="3" size="3"');
$mform->setType('repeats', PARAM_INT);
$mform->setDefault('repeats', 1);
$mform->disabledIf('repeats', 'repeat', 'notchecked');
$mform->setAdvanced('repeat');
$mform->setAdvanced('repeats');
$mform->addRule('repeats', get_string('maximumchars', '', 3), 'maxlength', 3, 'server');
}
}
calendar/event_form.php
+7 -2
View File
@@ -121,7 +121,8 @@ class event_form extends moodleform {
$group[] =& $mform->createElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
$group[] =& $mform->createElement('date_time_selector', 'timedurationuntil', '');
$group[] =& $mform->createElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2);
$group[] =& $mform->createElement('text', 'timedurationminutes', get_string('durationminutes', 'calendar'));
$group[] =& $mform->createElement('text', 'timedurationminutes',
get_string('durationminutes', 'calendar'), 'maxlength="7" size="7"');
$mform->addGroup($group, 'durationgroup', '', '<br />', false);
@@ -134,6 +135,9 @@ class event_form extends moodleform {
$mform->setType('timedurationminutes', PARAM_INT);
$mform->disabledIf('timedurationminutes','duration','noteq', 2);
$mform->addGroupRule('durationgroup', [
'timedurationminutes' => [[get_string('maximumchars', '', 7), 'maxlength', 7, 'server']],
]);
$mform->setDefault('duration', ($hasduration)?1:0);
@@ -141,10 +145,11 @@ class event_form extends moodleform {
$mform->addElement('header', 'repeatevents', get_string('repeatedevents', 'calendar'));
$mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null);
$mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
$mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="3" size="3"');
$mform->setType('repeats', PARAM_INT);
$mform->setDefault('repeats', 1);
$mform->disabledIf('repeats','repeat','notchecked');
$mform->addRule('repeats', get_string('maximumchars', '', 3), 'maxlength', 3, 'server');
} else if ($repeatedevents) {