From: skodak Date: Mon, 29 Oct 2007 20:35:05 +0000 (+0000) Subject: MDL-11955 required scale selection when grade type is scale X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6e75c7f8e57fad1144841b17880684c4c2bb2d42;p=moodle.git MDL-11955 required scale selection when grade type is scale --- diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php index 9251cfd9a1..f22fef0ddb 100644 --- a/grade/edit/tree/item_form.php +++ b/grade/edit/tree/item_form.php @@ -282,6 +282,12 @@ class edit_item_form extends moodleform { } */ + if (array_key_exists('gradetype', $data) and $data['gradetype'] == GRADE_TYPE_SCALE) { + if (empty($data['scaleid'])) { + $errors['scaleid'] = get_String('missingscale', 'grades'); + } + } + if (array_key_exists('grademin', $data) and array_key_exists('grademax', $data)) { if ($data['grademax'] == $data['grademin'] or $data['grademax'] < $data['grademin']) { $errors['grademin'] = get_String('incorrectminmax', 'grades'); diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index 53dfafaf32..6afe116cb7 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -276,6 +276,7 @@ $string['meangraded'] = 'Non-empty grades'; $string['meanselection'] = 'Grades selected for column averages'; $string['median'] = 'Median'; $string['min'] = 'Lowest'; +$string['missingscale'] = 'Scale must be selected'; $string['mode'] = 'Mode'; $string['movingelement'] = 'Moving $a'; $string['multfactor'] = 'Multiplicator';