Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle

This commit is contained in:
Dan Poltawski 2013-06-04 11:03:39 +08:00
commit 0d9121a1c4
2 changed files with 5 additions and 3 deletions

View File

@ -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) {

View File

@ -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,