mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-06-04 14:14:18 +08:00
commit e404e040d3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
course/renderer.php
View File

@ -369,9 +369,7 @@ class core_course_renderer extends plugin_renderer_base {
$activities = array(MOD_CLASS_ACTIVITY => array(), MOD_CLASS_RESOURCE => array()); $activities = array(MOD_CLASS_ACTIVITY => array(), MOD_CLASS_RESOURCE => array());
foreach ($modules as $module) { foreach ($modules as $module) {
if (!array_key_exists($module->archetype, $activities)) { if (isset($module->types)) {
// System modules cannot be added by user, do not add to dropdown
} else if (isset($module->types)) {
// This module has a subtype // This module has a subtype
// NOTE: this is legacy stuff, module subtypes are very strongly discouraged!! // NOTE: this is legacy stuff, module subtypes are very strongly discouraged!!
$subtypes = array(); $subtypes = array();
@ -381,17 +379,28 @@ class core_course_renderer extends plugin_renderer_base {
} }
// Sort module subtypes into the list // Sort module subtypes into the list
$activityclass = MOD_CLASS_ACTIVITY;
if ($module->archetype == MOD_CLASS_RESOURCE) {
$activityclass = MOD_CLASS_RESOURCE;
}
if (!empty($module->title)) { if (!empty($module->title)) {
// This grouping has a name // This grouping has a name
$activities[$module->archetype][] = array($module->title => $subtypes); $activities[$activityclass][] = array($module->title => $subtypes);
} else { } else {
// This grouping does not have a name // This grouping does not have a name
$activities[$module->archetype] = array_merge($activities[$module->archetype], $subtypes); $activities[$activityclass] = array_merge($activities[$activityclass], $subtypes);
} }
} else { } else {
// This module has no subtypes // This module has no subtypes
$activityclass = MOD_CLASS_ACTIVITY;
if ($module->archetype == MOD_ARCHETYPE_RESOURCE) {
$activityclass = MOD_CLASS_RESOURCE;
} else if ($module->archetype === MOD_ARCHETYPE_SYSTEM) {
// System modules cannot be added by user, do not add to dropdown
continue;
}
$link = $module->link->out(true, $urlparams); $link = $module->link->out(true, $urlparams);
$activities[$module->archetype][$link] = $module->title; $activities[$activityclass][$link] = $module->title;
} }
} }