moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

Browse source
This commit is contained in:
Dan Poltawski 2013-01-16 09:57:01 +08:00
commit 50dcac01eb
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
course/editsection_form.php
View file

@ -180,10 +180,41 @@ class editsection_form extends moodleform {
// Conditions: Don't let them set dates which make no sense // Conditions: Don't let them set dates which make no sense
if (array_key_exists('availablefrom', $data) && if (array_key_exists('availablefrom', $data) &&
$data['availablefrom'] && $data['availableuntil'] && $data['availablefrom'] && $data['availableuntil'] &&
$data['availablefrom'] > $data['availableuntil']) { $data['availablefrom'] >= $data['availableuntil']) {
$errors['availablefrom'] = get_string('badavailabledates', 'condition'); $errors['availablefrom'] = get_string('badavailabledates', 'condition');
} }
// Conditions: Verify that the grade conditions are numbers, and make sense.
if (array_key_exists('conditiongradegroup', $data)) {
foreach ($data['conditiongradegroup'] as $i => $gradedata) {
if ($gradedata['conditiongrademin'] !== '' &&
!is_numeric(unformat_float($gradedata['conditiongrademin']))) {
$errors["conditiongradegroup[{$i}]"] = get_string('gradesmustbenumeric', 'condition');
continue;
}
if ($gradedata['conditiongrademax'] !== '' &&
!is_numeric(unformat_float($gradedata['conditiongrademax']))) {
$errors["conditiongradegroup[{$i}]"] = get_string('gradesmustbenumeric', 'condition');
continue;
}
if ($gradedata['conditiongrademin'] !== '' && $gradedata['conditiongrademax'] !== '' &&
unformat_float($gradedata['conditiongrademax']) <= unformat_float($gradedata['conditiongrademin'])) {
$errors["conditiongradegroup[{$i}]"] = get_string('badgradelimits', 'condition');
continue;
}
if ($gradedata['conditiongrademin'] === '' && $gradedata['conditiongrademax'] === '' &&
$gradedata['conditiongradeitemid']) {
$errors["conditiongradegroup[{$i}]"] = get_string('gradeitembutnolimits', 'condition');
continue;
}
if (($gradedata['conditiongrademin'] !== '' || $gradedata['conditiongrademax'] !== '') &&
!$gradedata['conditiongradeitemid']) {
$errors["conditiongradegroup[{$i}]"] = get_string('gradelimitsbutnoitem', 'condition');
continue;
}
}
}
return $errors; return $errors;
} }
} }

2
course/moodleform_mod.php
View file

@ -332,7 +332,7 @@ abstract class moodleform_mod extends moodleform {
continue; continue;
} }
if ($gradedata['conditiongrademin'] !== '' && $gradedata['conditiongrademax'] !== '' && if ($gradedata['conditiongrademin'] !== '' && $gradedata['conditiongrademax'] !== '' &&
unformat_float($gradedata['conditiongrademax']) < unformat_float($gradedata['conditiongrademin'])) { unformat_float($gradedata['conditiongrademax']) <= unformat_float($gradedata['conditiongrademin'])) {
$errors["conditiongradegroup[{$i}]"] = get_string('badgradelimits', 'condition'); $errors["conditiongradegroup[{$i}]"] = get_string('badgradelimits', 'condition');
continue; continue;
} }