### Eclipse Workspace Patch 1.0 #P moodle19dev Index: mod/glossary/mod_form.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/glossary/mod_form.php,v retrieving revision 1.20.2.4 diff -u -r1.20.2.4 mod_form.php --- mod/glossary/mod_form.php 26 Sep 2009 16:25:48 -0000 1.20.2.4 +++ mod/glossary/mod_form.php 13 Aug 2010 15:32:15 -0000 @@ -187,6 +187,19 @@ ($default_values['assesstimestart'] && $default_values['assesstimefinish']) ? 1 : 0; } } + + 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: lang/en_utf8/glossary.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/Attic/glossary.php,v retrieving revision 1.8.2.5 diff -u -r1.8.2.5 glossary.php --- lang/en_utf8/glossary.php 17 Aug 2009 16:45:36 -0000 1.8.2.5 +++ lang/en_utf8/glossary.php 13 Aug 2010 15:32:15 -0000 @@ -175,6 +175,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['rsssubscriberss'] = 'Display the RSS feed for \'$a\' concepts';