Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle

This commit is contained in:
Sam Hemelryk
2012-06-14 11:31:46 +12:00
2 changed files with 29 additions and 16 deletions
+2 -2
View File
@@ -340,8 +340,8 @@ class assign_grading_table extends table_sql implements renderable {
$link = $this->output->action_link($url, $icon);
$separator = $this->output->spacer(array(), true);
}
$grade = $this->display_grade($row->grade, $this->quickgrading, $row->userid, $row->timemarked);
$gradingdisabled = $this->assignment->grading_disabled($row->id);
$grade = $this->display_grade($row->grade, $this->quickgrading && !$gradingdisabled, $row->userid, $row->timemarked);
//return $grade . $separator . $link;
return $link . $separator . $grade;