mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-19429 Validating 0 values for grademin, grademax and gradepass for the edit category form. Also checking for grademax < grademin case. Merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
nicolasconnault 2009-07-07 01:57:45 +00:00
parent 9e4c51ee4c
commit 5939e44447
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
grade/edit/tree/category.php
View File

@ -126,6 +126,18 @@ if ($mform->is_cancelled()) {
if (!isset($itemdata->aggregationcoef)) {
$itemdata->aggregationcoef = 0;
}
if (!isset($itemdata->gradepass) || $itemdata->gradepass == '') {
$itemdata->gradepass = 0;
}
if (!isset($itemdata->grademax) || $itemdata->grademax == '') {
$itemdata->grademax = 0;
}
if (!isset($itemdata->grademin) || $itemdata->grademin == '') {
$itemdata->grademin = 0;
}
$hidden = empty($itemdata->hidden) ? 0: $itemdata->hidden;
$hiddenuntil = empty($itemdata->hiddenuntil) ? 0: $itemdata->hiddenuntil;
@ -154,16 +166,16 @@ if ($mform->is_cancelled()) {
if (empty($grade_item->id)) {
$grade_item->id = $grade_item_copy->id;
}
if (empty($grade_item->grademax)) {
if (empty($grade_item->grademax) && $grade_item->grademax != '0') {
$grade_item->grademax = $grade_item_copy->grademax;
}
if (empty($grade_item->grademin)) {
if (empty($grade_item->grademin) && $grade_item->grademin != '0') {
$grade_item->grademin = $grade_item_copy->grademin;
}
if (empty($grade_item->gradepass)) {
if (empty($grade_item->gradepass) && $grade_item->gradepass != '0') {
$grade_item->gradepass = $grade_item_copy->gradepass;
}
if (empty($grade_item->aggregationcoef)) {
if (empty($grade_item->aggregationcoef) && $grade_item->aggregationcoef != '0') {
$grade_item->aggregationcoef = $grade_item_copy->aggregationcoef;
}

9
grade/edit/tree/category_form.php
View File

@ -1,4 +1,3 @@
<<<<<<< category_form.php
<?php //$Id$
///////////////////////////////////////////////////////////////////////////
@ -461,6 +460,14 @@ class edit_category_form extends moodleform {
$errors['grade_item_scaleid'] = get_string('missingscale', 'grades');
}
}
if (array_key_exists('grade_item_grademin', $data) and array_key_exists('grade_item_grademax', $data)) {
if (($data['grade_item_grademax'] != 0 OR $data['grade_item_grademin'] != 0) AND
($data['grade_item_grademax'] == $data['grade_item_grademin'] OR
$data['grade_item_grademax'] < $data['grade_item_grademin'])) {
$errors['grade_item_grademin'] = get_string('incorrectminmax', 'grades');
$errors['grade_item_grademax'] = get_string('incorrectminmax', 'grades');
}
}
return $errors;
}