From 912af66e61b02e2f67d5848e00ddd6da69d7b12c Mon Sep 17 00:00:00 2001 From: Daniel Neis Araujo Date: Fri, 14 Mar 2014 19:14:20 -0300 Subject: [PATCH] MDL-42869 calendar: HTML validation check fails on add event screen --- calendar/event_form.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/calendar/event_form.php b/calendar/event_form.php index 5b12a4d04da..69a89247aac 100644 --- a/calendar/event_form.php +++ b/calendar/event_form.php @@ -114,14 +114,23 @@ class event_form extends moodleform { $mform->addRule('timestart', get_string('required'), 'required'); $mform->addElement('header', 'durationdetails', get_string('eventduration', 'calendar')); - $mform->addElement('radio', 'duration', null, get_string('durationnone', 'calendar'), 0); - $mform->addElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1); - $mform->addElement('date_time_selector', 'timedurationuntil', ' '); - $mform->disabledIf('timedurationuntil','duration','noteq', 1); + $group = array(); + $group[] =& $mform->createElement('radio', 'duration', null, get_string('durationnone', 'calendar'), 0); + $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', null); + + $mform->addGroup($group, 'durationgroup', '', '
', false); + + $mform->disabledIf('timedurationuntil', 'duration', 'noteq', 1); + $mform->disabledIf('timedurationuntil[day]', 'duration', 'noteq', 1); + $mform->disabledIf('timedurationuntil[month]', 'duration', 'noteq', 1); + $mform->disabledIf('timedurationuntil[year]', 'duration', 'noteq', 1); + $mform->disabledIf('timedurationuntil[hour]', 'duration', 'noteq', 1); + $mform->disabledIf('timedurationuntil[minute]', 'duration', 'noteq', 1); - $mform->addElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2); - $mform->addElement('text', 'timedurationminutes', null); $mform->setType('timedurationminutes', PARAM_INT); $mform->disabledIf('timedurationminutes','duration','noteq', 2); @@ -130,7 +139,7 @@ class event_form extends moodleform { if ($newevent) { $mform->addElement('header', 'repeatevents', get_string('repeatedevents', 'calendar')); - $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null, 'repeat'); + $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null); $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"'); $mform->setType('repeats', PARAM_INT); $mform->setDefault('repeats', 1);