Skip to content

Speed up gathering of information for each course section #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: MOODLE_23_STABLE
Choose a base branch
from
Open

Speed up gathering of information for each course section #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 27 additions & 54 deletions course_menu/block_course_menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,69 +633,42 @@ function get_sections()
$newSec['name'] = $strsummary;
$newSec['url'] = course_get_url($this->course, $k);

// resources
$newSec['resources'] = array();
$sectionmods = explode(",", $section->sequence);
foreach ($sectionmods as $modnumber) {
if (empty($mods[$modnumber])) {
continue;
}
$mod = $mods[$modnumber];
if ($mod->visible or $canviewhidden) {
$instancename = urldecode($modinfo->cms[$modnumber]->name);

if (!empty($CFG->filterall)) {
$instancename = filter_text($instancename, $this->course->id);
if ($section->uservisible) {
// resources
$newSec['resources'] = array();
$sectionmods = explode(",", $section->sequence);
foreach ($sectionmods as $modnumber) {
if (empty($mods[$modnumber])) {
continue;
}
$mod = $mods[$modnumber];
if ($mod->uservisible) {
$instancename = urldecode($mod->name);

if (!empty($CFG->filterall)) {
$instancename = filter_text($instancename, $this->course->id);
}

// don't do anything for labels
if ($mod->modname != 'label') {
// Normal activity
if ($mod->visible or $canviewhidden) {
// don't do anything for labels
if ($mod->has_view()) {
// Normal activity
if (!strlen(trim($instancename))) {
$instancename = $mod->modfullname;
}

$resource = array();
if ($mod->modname != 'resource') {
$resource['name'] = $instancename;
$resource['url'] = "$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id";
$icon = $OUTPUT->pix_url("icon", $mod->modname);
if (is_object($icon)) {
$resource['icon'] = $icon->__toString();
} else {
$resource['icon'] = '';
}
} else {
require_once($CFG->dirroot . '/mod/resource/lib.php');
$info = resource_get_coursemodule_info($mod);
if (isset($info->icon)) {
$resource['name'] = $info->name;
$resource['url'] = "$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id";
$icon = $OUTPUT->pix_url("icon", $mod->modname);
if (is_object($icon)) {
$resource['icon'] = $icon->__toString();
} else {
$resource['icon'] = '';
}
} else if (!isset($info->icon)) {
$resource['name'] = $info->name;
$resource['url'] = "$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id";
$icon = $OUTPUT->pix_url("icon", $mod->modname);
if (is_object($icon)) {
$resource['icon'] = $icon->__toString();
} else {
$resource['icon'] = $OUTPUT->pix_url("icon", $mod->modname);
}
}
}
if ($section->uservisible) {
$newSec['resources'][] = $resource;
}
$url = $mod->get_url();
$iconurl = $mod->get_icon_url();

$resource = array(
'name' => $instancename,
'url'=> $url ? $url->out() : '',
'icon' => $iconurl ? $iconurl->out() : '',
);
$newSec['resources'][] = $resource;
}
}
}
}

$showsection = $section->uservisible ||
($section->visible && !$section->available && $section->showavailability);
//hide hidden sections from students if the course settings say that - bug #212
Expand Down