From 24a3f392ba69c9e0d4915cf784d4a84b8e02a726 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" Conflicts: mod/assign/locallib.php --- 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 e2a72841851..0f1aef80e05 100644 --- a/mod/assign/gradingbatchoperationsform.php +++ b/mod/assign/gradingbatchoperationsform.php @@ -52,7 +52,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'); } diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 142039f827f..c547f2843b7 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -2509,7 +2509,8 @@ class assign { array('cm'=>$this->get_course_module()->id, 'submissiondrafts'=>$this->get_instance()->submissiondrafts, 'duedate'=>$this->get_instance()->duedate, - 'feedbackplugins'=>$this->get_feedback_plugins()), + 'feedbackplugins'=>$this->get_feedback_plugins(), + 'context'=>$this->get_context()), 'post', '', array('class'=>'gradingbatchoperationsform')); @@ -2762,7 +2763,8 @@ class assign { array('cm'=>$this->get_course_module()->id, 'submissiondrafts'=>$this->get_instance()->submissiondrafts, 'duedate'=>$this->get_instance()->duedate, - 'feedbackplugins'=>$this->get_feedback_plugins()), + 'feedbackplugins'=>$this->get_feedback_plugins(), + 'context'=>$this->get_context()), 'post', '', array('class'=>'gradingbatchoperationsform'));