MDL-20058 workshop grades can be overridden in grading evaluation phase only

diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index 9c87490585e10161fd31592185c6ffe8a5de9425..39c4e09abd6951437314c0637293c17845309fb1 100644 (file)
--- a/mod/workshop/assessment.php
+++ b/mod/workshop/assessment.php
@@ -58,7 +58,7 @@ $currenttab = 'assessment';
 
 $canviewallassessments  = has_capability('mod/workshop:viewallassessments', $workshop->context);
 $canviewallsubmissions  = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
-$canoverridegrades      = has_capability('mod/workshop:overridegrades', $workshop->context);
+$canoverridegrades      = ($workshop->phase == workshop::PHASE_EVALUATION) and  has_capability('mod/workshop:overridegrades', $workshop->context);
 $isreviewer             = ($USER->id == $assessment->reviewerid);
 $isauthor               = ($USER->id == $submission->authorid);
 

diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index d1449bff2535edf067a7487a5617dc3de06c3e85..e04150ce045bf27a3c4fcdd8d929cacba2675a03 100644 (file)
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -57,7 +57,7 @@ if ($id) { // submission is specified
 $ownsubmission  = $submission->authorid == $USER->id;
 $canviewall     = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
 $cansubmit      = has_capability('mod/workshop:submit', $workshop->context);
-$canoverride    = has_capability('mod/workshop:overridegrades', $workshop->context);
+$canoverride    = ($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context);
 $isreviewer     = $DB->record_exists('workshop_assessments', array('submissionid' => $submission->id, 'reviewerid' => $USER->id));
 
 if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) {