Merge branch 'MDL-27459-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

2014-04-30 09:53:53 +08:00
parent 20ec5349d4 30503a0c21
commit 458d13af33
1 changed files with 5 additions and 0 deletions
@@ -666,6 +666,11 @@ abstract class moodleform_mod extends moodleform {
                $mform->disabledIf('completionusegrade', 'completion', 'ne', COMPLETION_TRACKING_AUTOMATIC);
                $mform->addHelpButton('completionusegrade', 'completionusegrade', 'completion');
                $gotcompletionoptions = true;
+
+                // If using the rating system, there is no grade unless ratings are enabled.
+                if ($this->_features->rating) {
+                    $mform->disabledIf('completionusegrade', 'assessed', 'eq', 0);
+                }
            }

            // Automatic completion according to module-specific rules