Merge branch 'MDL-49977_m28' of git://github.com/markn86/moodle into MOODLE_28_STABLE

This commit is contained in:
Dan Poltawski
2015-04-27 10:53:18 +01:00
+12 -2
View File
@@ -3726,7 +3726,12 @@ class assign {
$mform = new mod_assign_batch_set_marking_workflow_state_form(null, $formparams);
$mform->set_data($formdata); // Initialises the hidden elements.
$o .= $this->get_renderer()->header();
$header = new assign_header($this->get_instance(),
$this->get_context(),
$this->show_intro(),
$this->get_course_module()->id,
get_string('setmarkingworkflowstate', 'assign'));
$o .= $this->get_renderer()->render($header);
$o .= $this->get_renderer()->render(new assign_form('setworkflowstate', $mform));
$o .= $this->view_footer();
@@ -3793,7 +3798,12 @@ class assign {
$mform = new mod_assign_batch_set_allocatedmarker_form(null, $formparams);
$mform->set_data($formdata); // Initialises the hidden elements.
$o .= $this->get_renderer()->header();
$header = new assign_header($this->get_instance(),
$this->get_context(),
$this->show_intro(),
$this->get_course_module()->id,
get_string('setmarkingallocation', 'assign'));
$o .= $this->get_renderer()->render($header);
$o .= $this->get_renderer()->render(new assign_form('setworkflowstate', $mform));
$o .= $this->view_footer();