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

MDL-37329 Navigation: Enrolled courses in category should be added only.

Browse Source
This commit is contained in:
Rajesh Taneja
2013-02-20 12:41:21 +08:00
committed by Damyon Wiese
parent d432ff9e99
commit 2225d0cfe6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+6 -1
View File
@@ -2826,9 +2826,11 @@ class global_navigation_for_ajax extends global_navigation {
ORDER BY cc.depth ASC, cc.sortorder ASC, cc.id ASC";
$params = array('categoryid1' => $categoryid, 'categoryid2' => $categoryid);
$categories = $DB->get_recordset_sql($sql, $params, 0, $limit);
$categorylist = array();
$subcategories = array();
$basecategory = null;
foreach ($categories as $category) {
$categorylist[] = $category->id;
context_helper::preload_from_record($category);
if ($category->id == $categoryid) {
$this->add_category($category, $this, $nodetype);
@@ -2849,7 +2851,10 @@ class global_navigation_for_ajax extends global_navigation {
if ($nodetype === self::TYPE_MY_CATEGORY) {
$courses = enrol_get_my_courses();
foreach ($courses as $course) {
$this->add_course($course, true, self::COURSE_MY);
// Add course if it's in category.
if (in_array($course->category, $categorylist)) {
$this->add_course($course, true, self::COURSE_MY);
}
}
} else {
$courses = $DB->get_recordset('course', array('category' => $categoryid), 'sortorder', '*' , 0, $limit);