Permalink
Browse files

statistics MDL-25822 Fix broken navigation

  • Loading branch information...
danpoltawski committed Dec 30, 2010
1 parent f9c2702 commit 9e202d38c833cd6eed1e2bb1279223d1f7e2fb6b
Showing with 10 additions and 7 deletions.
  1. +8 −5 course/report/stats/index.php
  2. +2 −2 course/report/stats/lib.php
@@ -37,9 +37,14 @@
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
-
require_capability('coursereport/stats:view', $context);
+ $PAGE->set_url(new moodle_url('/course/report/stats/index.php', array('course' => $course->id,
+ 'report' => $report,
+ 'time' => $time,
+ 'mode' => $mode,
+ 'userid' => $userid)));
+
add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
stats_check_uptodate($course->id);
@@ -52,10 +57,8 @@
$PAGE->set_title("$course->shortname: $strstats");
$PAGE->set_heading($course->fullname);
- //$PAGE->set_headingmenu();
- $PAGE->navbar->add($strreports, new moodle_url('/course/report.php', array('id'=>$course->id)));
- $PAGE->navbar->add($strstats);
- $PAGE->headingmenu(report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php"));
+ $PAGE->set_pagelayout('report');
+ $PAGE->set_headingmenu(report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php"));
echo $OUTPUT->header();
}
@@ -46,7 +46,7 @@ function report_stats_mode_menu($course, $mode, $time, $url) {
$popupurl = $url."?course=$course->id&time=$time";
$select = new single_select(new moodle_url($popupurl), 'mode', $options, $mode, null);
$select->formid = 'switchmode';
- echo $OUTPUT->render($select);
+ return $OUTPUT->render($select);
}
@@ -86,7 +86,7 @@ function stats_report_extend_navigation($navigation, $course, $context) {
global $CFG, $OUTPUT;
if (has_capability('coursereport/stats:view', $context)) {
if (!empty($CFG->enablestats)) {
- $url = new moodle_url('/course/report/stats/index.php', array('id'=>$course->id));
+ $url = new moodle_url('/course/report/stats/index.php', array('course'=>$course->id));
$navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, new pix_icon('i/report', ''));
}
}

0 comments on commit 9e202d3

Please sign in to comment.