Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle

This commit is contained in:
Andrew Nicols
2016-01-19 08:45:42 +08:00
2 changed files with 5 additions and 0 deletions
+1
View File
@@ -99,6 +99,7 @@ $string['batchoperationreverttodraft'] = 'revert submissions to draft';
$string['batchsetallocatedmarker'] = 'Set allocated marker for {$a} selected user(s).';
$string['batchsetmarkingworkflowstateforusers'] = 'Set marking workflow state for {$a} selected user(s).';
$string['blindmarking'] = 'Blind marking';
$string['blindmarkingenabledwarning'] = 'Blind marking is enabled on this activity.';
$string['blindmarking_help'] = 'Blind marking hides the identity of students from markers. Blind marking settings will be locked once a submission or grade has been made in relation to this assignment.';
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
$string['choosegradingaction'] = 'Grading action';
+4
View File
@@ -3426,6 +3426,10 @@ class assign {
$o .= plagiarism_update_status($this->get_course(), $this->get_course_module());
}
if ($this->is_blind_marking() && has_capability('mod/assign:viewblinddetails', $this->get_context())) {
$o .= $this->get_renderer()->notification(get_string('blindmarkingenabledwarning', 'assign'), 'notifymessage');
}
// Load and print the table of submissions.
if ($showquickgrading && $quickgrading) {
$gradingtable = new assign_grading_table($this, $perpage, $filter, 0, true);