From 208e1376be51c542aea5bd3376b72026e3ddad2f Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 4 Feb 2019 12:28:34 +0100 Subject: [PATCH] MDL-64761 assign: Return grader -1 when hidden in get_submission_status --- mod/assign/externallib.php | 8 ++++---- mod/assign/locallib.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/assign/externallib.php b/mod/assign/externallib.php index ad761dca3d9..f56707840aa 100644 --- a/mod/assign/externallib.php +++ b/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; } diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 1be55b78d28..0d74c1e3fec 100644 --- a/mod/assign/locallib.php +++ b/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() ); -- 2.43.0