Permalink
Browse files

Merge branch 'm23_MDL-35255' of git://github.com/danmarsden/moodle in…

…to MOODLE_23_STABLE
  • Loading branch information...
2 parents cfe32be + 4d48a65 commit cb3a1e355bdf531de5316b3b39c33d8d6812b702 Sam Hemelryk committed Sep 11, 2012
Showing with 5 additions and 6 deletions.
  1. +5 −6 mod/assign/locallib.php
View
11 mod/assign/locallib.php
@@ -1762,19 +1762,18 @@ private function view_grading_table() {
$gradingoptionsdata->filter = $filter;
$gradingoptionsform->set_data($gradingoptionsdata);
+ $actionformtext = $this->output->render($gradingactions);
+ $o .= $this->output->render(new assign_header($this->get_instance(),
+ $this->get_context(), false, $this->get_course_module()->id, get_string('grading', 'assign'), $actionformtext));
+ $o .= groups_print_activity_menu($this->get_course_module(), $CFG->wwwroot . '/mod/assign/view.php?id=' . $this->get_course_module()->id.'&action=grading', true);
+
// plagiarism update status apearring in the grading book
if (!empty($CFG->enableplagiarism)) {
/** Include plagiarismlib.php */
require_once($CFG->libdir . '/plagiarismlib.php');
$o .= plagiarism_update_status($this->get_course(), $this->get_course_module());
}
- $actionformtext = $this->output->render($gradingactions);
- $o .= $this->output->render(new assign_header($this->get_instance(),
- $this->get_context(), false, $this->get_course_module()->id, get_string('grading', 'assign'), $actionformtext));
- $o .= groups_print_activity_menu($this->get_course_module(), $CFG->wwwroot . '/mod/assign/view.php?id=' . $this->get_course_module()->id.'&action=grading', true);
-
-
// load and print the table of submissions
if ($showquickgrading && $quickgrading) {
$table = $this->output->render(new assign_grading_table($this, $perpage, $filter, 0, true));

0 comments on commit cb3a1e3

Please sign in to comment.