Merge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski
2012-07-30 13:46:22 +08:00
+2 -1
View File
@@ -556,7 +556,8 @@ class gradingform_rubric_controller extends gradingform_controller {
return $this->get_instance($instance);
}
if ($itemid && $raterid) {
if ($rs = $DB->get_records('grading_instances', array('raterid' => $raterid, 'itemid' => $itemid), 'timemodified DESC', '*', 0, 1)) {
$params = array('definitionid' => $this->definition->id, 'raterid' => $raterid, 'itemid' => $itemid);
if ($rs = $DB->get_records('grading_instances', $params, 'timemodified DESC', '*', 0, 1)) {
$record = reset($rs);
$currentinstance = $this->get_current_instance($raterid, $itemid);
if ($record->status == gradingform_rubric_instance::INSTANCE_STATUS_INCOMPLETE &&