L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-77563-master' of https://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2023-07-05 22:06:21 +08:00
parent cee81e21c1 c99afc4bff
commit 545c7e3037
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+15 -22
View File
@@ -5438,18 +5438,21 @@ class assign {
}
$gradeddate = $gradebookgrade->dategraded;
// Only display the grader if it is in the right state.
if (in_array($gradingstatus, [ASSIGN_GRADING_STATUS_GRADED, ASSIGN_MARKING_WORKFLOW_STATE_RELEASED])){
if (isset($grade->grader) && $grade->grader > 0) {
$grader = $DB->get_record('user', array('id' => $grade->grader));
} else if (isset($gradebookgrade->usermodified)
&& $gradebookgrade->usermodified > 0
&& has_capability('mod/assign:grade', $this->get_context(), $gradebookgrade->usermodified)) {
// Grader not provided. Check that usermodified is a user who can grade.
// Case 1: When an assignment is reopened an empty assign_grade is created so the feedback
// plugin can know which attempt it's referring to. In this case, usermodifed is a student.
// Case 2: When an assignment's grade is overrided via the gradebook, usermodified is a grader
$grader = $DB->get_record('user', array('id' => $gradebookgrade->usermodified));
// Show the grader's identity if 'Hide Grader' is disabled or has the 'Show Hidden Grader' capability.
if (has_capability('mod/assign:showhiddengrader', $this->context) || !$this->is_hidden_grader()) {
// Only display the grader if it is in the right state.
if (in_array($gradingstatus, [ASSIGN_GRADING_STATUS_GRADED, ASSIGN_MARKING_WORKFLOW_STATE_RELEASED])) {
if (isset($grade->grader) && $grade->grader > 0) {
$grader = $DB->get_record('user', array('id' => $grade->grader));
} else if (isset($gradebookgrade->usermodified)
&& $gradebookgrade->usermodified > 0
&& has_capability('mod/assign:grade', $this->get_context(), $gradebookgrade->usermodified)) {
// Grader not provided. Check that usermodified is a user who can grade.
// Case 1: When an assignment is reopened an empty assign_grade is created so the feedback
// plugin can know which attempt it's referring to. In this case, usermodifed is a student.
// Case 2: When an assignment's grade is overrided via the gradebook, usermodified is a grader.
$grader = $DB->get_record('user', array('id' => $gradebookgrade->usermodified));
}
}
}
}
@@ -5472,16 +5475,6 @@ class assign {
$gradingcontrollergrade
);
// Show the grader's identity if 'Hide Grader' is disabled or has the 'Show Hidden Grader' capability.
$showgradername = (
has_capability('mod/assign:showhiddengrader', $this->context) or
!$this->is_hidden_grader()
);
if (!$showgradername) {
$feedbackstatus->grader = false;
}
return $feedbackstatus;
}
return;