mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity

MDL-64761 assign: Return grader -1 when hidden in get_submission_status

Browse Source
This commit is contained in:
Dani Palou 2019-02-04 12:28:34 +01:00
parent a62e275984
commit 208e1376be
2 changed files with 5 additions and 5 deletions

8
mod/assign/externallib.php

@ -211,7 +211,7 @@ class mod_assign_external extends external_api {
'attemptnumber' => new external_value(PARAM_INT, 'attempt number'),
'timecreated' => new external_value(PARAM_INT, 'grade creation time'),
'timemodified' => new external_value(PARAM_INT, 'grade last modified time'),
'grader' => new external_value(PARAM_INT, 'grader'),
'grader' => new external_value(PARAM_INT, 'grader, -1 if grader is hidden'),
'grade' => new external_value(PARAM_TEXT, 'grade'),
'gradefordisplay' => new external_value(PARAM_RAW, 'grade rendered into a format suitable for display',
VALUE_OPTIONAL),
@ -2383,7 +2383,7 @@ class mod_assign_external extends external_api {
$result['gradingsummary'] = $gradingsummary;
}
// Show the grader's identity if 'Hide Grader' is disabled or has the 'Show Hidden Grader' capability.
$showgradername = (has_capability('mod/assign:showhiddengrader', $context, $user) or
$showgradername = (has_capability('mod/assign:showhiddengrader', $context) or
!$assign->is_hidden_grader());
// Did we submit anything?
@ -2432,7 +2432,7 @@ class mod_assign_external extends external_api {
if ($feedback) {
if ($feedback->grade) {
if (!$showgradername) {
$feedback->grade->grader = false;
$feedback->grade->grader = -1;
}
$feedbackplugins = $assign->get_feedback_plugins();
$feedback->plugins = self::get_plugins_data($assign, $feedbackplugins, $feedback->grade);
@ -2473,7 +2473,7 @@ class mod_assign_external extends external_api {
if ($grade) {
// From object to id.
if (!$showgradername) {
$grade->grader = false;
$grade->grader = -1;
} else {
$grade->grader = $grade->grader->id;
}

2
mod/assign/locallib.php

@ -5215,7 +5215,7 @@ class assign {
// 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, $user) or
has_capability('mod/assign:showhiddengrader', $this->context) or
!$this->is_hidden_grader()
);