From c7e4403c9f3212e4ab51fdb45e22ed36cf0f3686 Mon Sep 17 00:00:00 2001 From: Ashley Holman Date: Wed, 29 May 2013 11:57:33 +0800 Subject: [PATCH] MDL-39743 assign: Fix missing capability check for "grant extension" --- mod/assign/gradingbatchoperationsform.php | 2 +- mod/assign/locallib.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/assign/gradingbatchoperationsform.php b/mod/assign/gradingbatchoperationsform.php index 4be18c35104..21788ad0da0 100644 --- a/mod/assign/gradingbatchoperationsform.php +++ b/mod/assign/gradingbatchoperationsform.php @@ -49,7 +49,7 @@ class mod_assign_grading_batch_operations_form extends moodleform { if ($instance['submissiondrafts']) { $options['reverttodraft'] = get_string('reverttodraft', 'assign'); } - if ($instance['duedate']) { + if ($instance['duedate'] && has_capability('mod/assign:grantextension', $instance['context'])) { $options['grantextension'] = get_string('grantextension', 'assign'); } if ($instance['attemptreopenmethod'] == ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL) { diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index bce42d2e2ce..f59d53df40b 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -2876,7 +2876,8 @@ class assign { 'submissiondrafts'=>$this->get_instance()->submissiondrafts, 'duedate'=>$this->get_instance()->duedate, 'attemptreopenmethod'=>$this->get_instance()->attemptreopenmethod, - 'feedbackplugins'=>$this->get_feedback_plugins()); + 'feedbackplugins'=>$this->get_feedback_plugins(), + 'context'=>$this->get_context()); $classoptions = array('class'=>'gradingbatchoperationsform'); $gradingbatchoperationsform = new mod_assign_grading_batch_operations_form(null, @@ -3152,7 +3153,8 @@ class assign { 'submissiondrafts'=>$this->get_instance()->submissiondrafts, 'duedate'=>$this->get_instance()->duedate, 'attemptreopenmethod'=>$this->get_instance()->attemptreopenmethod, - 'feedbackplugins'=>$this->get_feedback_plugins()); + 'feedbackplugins'=>$this->get_feedback_plugins(), + 'context'=>$this->get_context()); $formclasses = array('class'=>'gradingbatchoperationsform'); $mform = new mod_assign_grading_batch_operations_form(null, $batchformparams,