L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-39743-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2013-06-04 11:03:45 +08:00
parent c687e8d741 e9efc2baa2
commit e19a07bfcb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingbatchoperationsform.php
+1 -1
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) {
mod/assign/locallib.php
+4 -2
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,