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

Fixed a bug where editing an event did display the "duration in minutes"

Browse Source 
stuff, but totally ignored it when submitting changes. Also, fixed one
warning in the "minutes" field.
This commit is contained in:
defacer
2004-05-24 10:49:01 +00:00
parent 5e2b88c23b
commit fbb56b9db7
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/event.php
+14 -2
View File
@@ -104,6 +104,9 @@
$form->timeduration = 0;
}
}
else if($form->duration == 2) {
$form->timeduration = $form->minutes * 60;
}
else {
$form->timeduration = 0;
}
@@ -245,11 +248,20 @@
$form->timeduration = $event->timeduration;
$form->id = $event->id;
$form->format = $defaultformat;
if($event->timeduration) {
if($event->timeduration > 3600) {
// More than one hour, so default to normal duration mode
$form->duration = 1;
$form->minutes = '';
}
else if($event->timeduration) {
// Up to one hour, "minutes" mode probably is better here
$form->duration = 2;
$form->minutes = $event->timeduration / 60;
}
else {
// No duration
$form->duration = 0;
$form->minutes = '';
}
}
print_side_block_start(get_string('editevent', 'calendar'), '', 'mycalendar');
@@ -469,7 +481,7 @@ function validate_form(&$form, &$err) {
if($form->duration == 2 and !($form->minutes > 0 and $form->minutes < 1000)) {
$err['minutes'] = get_string('errorinvalidminutes', 'calendar');
}
if ($form->repeat and !($form->repeats > 1 and $form->repeats < 100)) {
if (!empty($form->repeat) and !($form->repeats > 1 and $form->repeats < 100)) {
$err['repeats'] = get_string('errorinvalidrepeats', 'calendar');
}
if(!empty($form->courseid)) {