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

This commit is contained in:
Dan Poltawski
2013-06-04 11:03:55 +08:00
2 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -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');
}
+4 -2
View File
@@ -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'));