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 9251cfd9a1cb6e1035ec9af7dff443f5500307c8..f22fef0ddb677c7d798bcb3cc585fae630cea885 100644 (file)
--- 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 53dfafaf323b4371ce97c262ebe6749a38c460bb..6afe116cb79ee2b3c9bc60927b22dcd22d8eee80 100644 (file)
--- 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';