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

Merge branch 'MDL-40515' of git://github.com/aolley/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-11-04 12:10:39 +08:00
parent 42fb49ae0b 7893297888
commit 92dc72a6b5
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/log/locallib.php
+22 -4
View File
@@ -224,12 +224,14 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
$modinfo = get_fast_modinfo($course);
if (!empty($modinfo->cms)) {
$section = 0;
$thissection = array();
foreach ($modinfo->cms as $cm) {
if (!$cm->uservisible || !$cm->has_view()) {
continue;
}
if ($cm->sectionnum > 0 and $section <> $cm->sectionnum) {
$activities["section/$cm->sectionnum"] = '--- '.get_section_name($course, $cm->sectionnum).' ---';
$activities[] = $thissection;
$thissection = array();
}
$section = $cm->sectionnum;
$modname = strip_tags($cm->get_formatted_name());
@@ -239,12 +241,19 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
if (!$cm->visible) {
$modname = "(".$modname.")";
}
$activities["$cm->id"] = $modname;
$key = get_section_name($course, $cm->sectionnum);
if (!isset($thissection[$key])) {
$thissection[$key] = array();
}
$thissection[$key][$cm->id] = $modname;
if ($cm->id == $modid) {
$selectedactivity = "$cm->id";
}
}
if (!empty($thissection)) {
$activities[] = $thissection;
}
}
if (has_capability('report/log:view', $sitecontext) && !$course->category) {
@@ -478,12 +487,14 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
$modinfo = get_fast_modinfo($course);
if (!empty($modinfo->cms)) {
$section = 0;
$thissection = array();
foreach ($modinfo->cms as $cm) {
if (!$cm->uservisible || !$cm->has_view()) {
continue;
}
if ($cm->sectionnum > 0 and $section <> $cm->sectionnum) {
$activities["section/$cm->sectionnum"] = '--- '.get_section_name($course, $cm->sectionnum).' ---';
$activities[] = $thissection;
$thissection = array();
}
$section = $cm->sectionnum;
$modname = strip_tags($cm->get_formatted_name());
@@ -493,12 +504,19 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
if (!$cm->visible) {
$modname = "(".$modname.")";
}
$activities["$cm->id"] = $modname;
$key = get_section_name($course, $cm->sectionnum);
if (!isset($thissection[$key])) {
$thissection[$key] = array();
}
$thissection[$key][$cm->id] = $modname;
if ($cm->id == $modid) {
$selectedactivity = "$cm->id";
}
}
if (!empty($thissection)) {
$activities[] = $thissection;
}
}
if (has_capability('report/log:view', $sitecontext) && ($course->id == SITEID)) {