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

MDL-45884 navigation: tidied up code and added behat tests

Browse Source
This commit is contained in:
Sam Hemelryk
2014-06-13 10:16:25 +12:00
parent 4d378e9f70
commit aab6438ca1
4 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+8 -8
View File
@@ -979,7 +979,7 @@ class global_navigation extends navigation_node {
protected $initialised = false;
/** @var array An array of course information */
protected $mycourses = array();
/** @var array An array for containing root navigation nodes */
/** @var navigation_node[] An array for containing root navigation nodes */
protected $rootnodes = array();
/** @var bool A switch for whether to show empty sections in the navigation */
protected $showemptysections = true;
@@ -1133,13 +1133,13 @@ class global_navigation extends navigation_node {
$this->rootnodes['courses']->isexpandable = true;
}
if (empty($CFG->navcollapsemycourses)){
if ($this->rootnodes['mycourses']->isactive) {
$this->load_courses_enrolled();
}
} else {
$this->rootnodes['mycourses']->collapse = true;
$this->rootnodes['mycourses']->make_inactive();
// Load the users enrolled courses if they are viewing the My Moodle page AND the admin has not
// set that they wish to keep the My Courses branch collapsed by default.
if (empty($CFG->navcollapsemycourses) && $this->rootnodes['mycourses']->isactive){
$this->load_courses_enrolled();
} else {
$this->rootnodes['mycourses']->collapse = true;
$this->rootnodes['mycourses']->make_inactive();
}
$canviewcourseprofile = true;