### Eclipse Workspace Patch 1.0 #P moodle20 Index: mod/glossary/mod_form.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/glossary/mod_form.php,v retrieving revision 1.38 diff -u -r1.38 mod_form.php --- mod/glossary/mod_form.php 13 Aug 2010 08:29:13 -0000 1.38 +++ mod/glossary/mod_form.php 15 Aug 2010 09:25:43 -0000 @@ -157,6 +157,18 @@ function data_preprocessing(&$default_values){ parent::data_preprocessing($default_values); } + function validation($data, $files) { + $errors = parent::validation($data, $files); + // Check open and close times are consistent. + if ($data['assesstimestart'] != 0 && $data['assesstimefinish'] != 0 && $data['assesstimefinish'] < $data['assesstimestart']) { + $errors['assesstimefinish'] = get_string('ratingtimerange', 'glossary'); + } + if (count($errors) == 0) { + return true; + } else { + return $errors; + } + } } Index: mod/glossary/lang/en/glossary.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/glossary/lang/en/glossary.php,v retrieving revision 1.9 diff -u -r1.9 glossary.php --- mod/glossary/lang/en/glossary.php 5 Jul 2010 05:12:40 -0000 1.9 +++ mod/glossary/lang/en/glossary.php 15 Aug 2010 09:25:43 -0000 @@ -233,6 +233,7 @@ $string['ratingssaved'] = 'Ratings saved'; $string['ratingsuse'] = 'Use ratings'; $string['ratingtime'] = 'Restrict ratings to entries with dates in this range:'; +$string['ratingtimerange'] = 'Could not update the glossary. You have specified a range To date before the From date.'; $string['rejectedentries'] = 'Rejected entries'; $string['rejectionrpt'] = 'Rejection Report'; $string['resetglossaries'] = 'Delete entries from';