';
+if ($canmanage and $numcourses > 1) {
+ // Print button to re-sort courses by name
+ $url = new moodle_url('/course/category.php', array('id' => $category->id, 'resort' => 'name', 'sesskey' => sesskey()));
+ echo $OUTPUT->single_button($url, get_string('resortcoursesbyname'), 'get');
+}
+
+if (has_capability('moodle/course:create', $context)) {
+ // Print button to create a new course
+ $url = new moodle_url('/course/edit.php', array('category' => $category->id, 'returnto' => 'category'));
+ echo $OUTPUT->single_button($url, get_string('addnewcourse'), 'get');
+}
- print_course_search();
+if (!empty($CFG->enablecourserequests) && $category->id == $CFG->defaultrequestcategory) {
+ print_course_request_buttons(get_context_instance(CONTEXT_SYSTEM));
+}
+echo '
';
- echo $OUTPUT->footer();
+print_course_search();
+echo $OUTPUT->footer();
\ No newline at end of file
diff --git a/course/editcategory.php b/course/editcategory.php
index 9752cce1713a5..ff4bad5e0b608 100644
--- a/course/editcategory.php
+++ b/course/editcategory.php
@@ -1,9 +1,29 @@
.
+
/**
* Page for creating or editing course category name/parent/description.
* When called with an id parameter, edits the category with that id.
* Otherwise it creates a new category with default parent from the parent
* parameter, which may be 0.
+ *
+ * @package core
+ * @subpackage course
+ * @copyright 2007 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once('../config.php');
@@ -108,6 +128,21 @@
redirect('category.php?id='.$newcategory->id.'&categoryedit=on');
}
+// Unfortunately the navigation never generates correctly for this page because technically
+// this page doesn't actually exist on the navigation you get here through the course
+// management page.
+try {
+ // First up we'll try to make the course management page active seeing as that is
+ // where the user thinks they are.
+ // The big prolem here is that the course management page is a common page
+ // for both editing users and common users.
+ $PAGE->settingsnav->get('root')->get('courses')->get('coursemgmt')->make_active();
+} catch (Exception $ex) {
+ // Failing that we'll override the URL, not as accurate and chances are things
+ // won't be 100% correct all the time but should work most times.
+ navigation_node::override_active_url(new moodle_url('/course/index.php', array('categoryedit' => 'on')));
+}
+
$PAGE->set_title($title);
$PAGE->set_heading($fullname);
echo $OUTPUT->header();
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 963f431c86300..45ef60e491a40 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1057,7 +1057,10 @@ public function initialise() {
$mycourses = enrol_get_my_courses(NULL, 'visible DESC,sortorder ASC');
$showallcourses = (count($mycourses) == 0 || !empty($CFG->navshowallcourses));
- $showcategories = ($showallcourses && $this->show_categories());
+ // When checking if we are to show categories there is an additional override.
+ // If the user is viewing a category then we will load it regardless of settings.
+ // to ensure that the navigation is consistent.
+ $showcategories = $this->page->context->contextlevel == CONTEXT_COURSECAT || ($showallcourses && $this->show_categories());
$issite = ($this->page->course->id == SITEID);
$ismycourse = (array_key_exists($this->page->course->id, $mycourses));
@@ -1152,188 +1155,201 @@ public function initialise() {
$canviewcourseprofile = true;
- if (!$issite) {
- // Next load context specific content into the navigation
- switch ($this->page->context->contextlevel) {
- case CONTEXT_SYSTEM :
- // This has already been loaded we just need to map the variable
- $coursenode = $frontpagecourse;
- $this->load_all_categories(null, $showcategories);
- break;
- case CONTEXT_COURSECAT :
- // This has already been loaded we just need to map the variable
- $coursenode = $frontpagecourse;
- $this->load_all_categories($this->page->context->instanceid, $showcategories);
+ // Next load context specific content into the navigation
+ switch ($this->page->context->contextlevel) {
+ case CONTEXT_SYSTEM :
+ // This has already been loaded we just need to map the variable
+ $coursenode = $frontpagecourse;
+ $this->load_all_categories(null, $showcategories);
+ break;
+ case CONTEXT_COURSECAT :
+ // This has already been loaded we just need to map the variable
+ $coursenode = $frontpagecourse;
+ $this->load_all_categories($this->page->context->instanceid, $showcategories);
+ if (array_key_exists($this->page->context->instanceid, $this->addedcategories)) {
+ $this->addedcategories[$this->page->context->instanceid]->make_active();
+ }
+ break;
+ case CONTEXT_BLOCK :
+ case CONTEXT_COURSE :
+ if ($issite) {
+ // If it is the front page course, or a block on it then
+ // everything has already been loaded.
break;
- case CONTEXT_BLOCK :
- case CONTEXT_COURSE :
- // Load the course associated with the page into the navigation
- $course = $this->page->course;
- if ($showcategories && !$ismycourse) {
- $this->load_all_categories($course->category, $showcategories);
- }
- $coursenode = $this->load_course($course);
+ }
+ // Load the course associated with the page into the navigation
+ $course = $this->page->course;
+ if ($showcategories && !$ismycourse) {
+ $this->load_all_categories($course->category, $showcategories);
+ }
+ $coursenode = $this->load_course($course);
- // If the course wasn't added then don't try going any further.
- if (!$coursenode) {
- $canviewcourseprofile = false;
- break;
- }
+ // If the course wasn't added then don't try going any further.
+ if (!$coursenode) {
+ $canviewcourseprofile = false;
+ break;
+ }
- // If the user is not enrolled then we only want to show the
- // course node and not populate it.
-
- // Not enrolled, can't view, and hasn't switched roles
- if (!can_access_course($course)) {
- // TODO: very ugly hack - do not force "parents" to enrol into course their child is enrolled in,
- // this hack has been propagated from user/view.php to display the navigation node. (MDL-25805)
- $isparent = false;
- if ($this->useridtouseforparentchecks) {
- if ($this->useridtouseforparentchecks != $USER->id) {
- $usercontext = get_context_instance(CONTEXT_USER, $this->useridtouseforparentchecks, MUST_EXIST);
- if ($DB->record_exists('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id))
- and has_capability('moodle/user:viewdetails', $usercontext)) {
- $isparent = true;
- }
+ // If the user is not enrolled then we only want to show the
+ // course node and not populate it.
+
+ // Not enrolled, can't view, and hasn't switched roles
+ if (!can_access_course($course)) {
+ // TODO: very ugly hack - do not force "parents" to enrol into course their child is enrolled in,
+ // this hack has been propagated from user/view.php to display the navigation node. (MDL-25805)
+ $isparent = false;
+ if ($this->useridtouseforparentchecks) {
+ if ($this->useridtouseforparentchecks != $USER->id) {
+ $usercontext = get_context_instance(CONTEXT_USER, $this->useridtouseforparentchecks, MUST_EXIST);
+ if ($DB->record_exists('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id))
+ and has_capability('moodle/user:viewdetails', $usercontext)) {
+ $isparent = true;
}
}
-
- if (!$isparent) {
- $coursenode->make_active();
- $canviewcourseprofile = false;
- break;
- }
- }
- // Add the essentials such as reports etc...
- $this->add_course_essentials($coursenode, $course);
- if ($this->format_display_course_content($course->format)) {
- // Load the course sections
- $sections = $this->load_course_sections($course, $coursenode);
}
- if (!$coursenode->contains_active_node() && !$coursenode->search_for_active_node()) {
+
+ if (!$isparent) {
$coursenode->make_active();
+ $canviewcourseprofile = false;
+ break;
+ }
+ }
+ // Add the essentials such as reports etc...
+ $this->add_course_essentials($coursenode, $course);
+ if ($this->format_display_course_content($course->format)) {
+ // Load the course sections
+ $sections = $this->load_course_sections($course, $coursenode);
+ }
+ if (!$coursenode->contains_active_node() && !$coursenode->search_for_active_node()) {
+ $coursenode->make_active();
+ }
+ break;
+ case CONTEXT_MODULE :
+ if ($issite) {
+ // If this is the site course then most information will have
+ // already been loaded.
+ // However we need to check if there is more content that can
+ // yet be loaded for the specific module instance.
+ $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY);
+ if ($activitynode) {
+ $this->load_activity($this->page->cm, $this->page->course, $activitynode);
}
break;
- case CONTEXT_MODULE :
- $course = $this->page->course;
- $cm = $this->page->cm;
+ }
- if ($showcategories && !$ismycourse) {
- $this->load_all_categories($course->category, $showcategories);
- }
+ $course = $this->page->course;
+ $cm = $this->page->cm;
- // Load the course associated with the page into the navigation
- $coursenode = $this->load_course($course);
+ if ($showcategories && !$ismycourse) {
+ $this->load_all_categories($course->category, $showcategories);
+ }
- // If the course wasn't added then don't try going any further.
- if (!$coursenode) {
- $canviewcourseprofile = false;
- break;
- }
+ // Load the course associated with the page into the navigation
+ $coursenode = $this->load_course($course);
- // If the user is not enrolled then we only want to show the
- // course node and not populate it.
- if (!can_access_course($course)) {
- $coursenode->make_active();
- $canviewcourseprofile = false;
- break;
- }
+ // If the course wasn't added then don't try going any further.
+ if (!$coursenode) {
+ $canviewcourseprofile = false;
+ break;
+ }
- $this->add_course_essentials($coursenode, $course);
+ // If the user is not enrolled then we only want to show the
+ // course node and not populate it.
+ if (!can_access_course($course)) {
+ $coursenode->make_active();
+ $canviewcourseprofile = false;
+ break;
+ }
- // Get section number from $cm (if provided) - we need this
- // before loading sections in order to tell it to load this section
- // even if it would not normally display (=> it contains only
- // a label, which we are now editing)
- $sectionnum = isset($cm->sectionnum) ? $cm->sectionnum : 0;
+ $this->add_course_essentials($coursenode, $course);
+
+ // Get section number from $cm (if provided) - we need this
+ // before loading sections in order to tell it to load this section
+ // even if it would not normally display (=> it contains only
+ // a label, which we are now editing)
+ $sectionnum = isset($cm->sectionnum) ? $cm->sectionnum : 0;
+ if ($sectionnum) {
+ // This value has to be stored in a member variable because
+ // otherwise we would have to pass it through a public API
+ // to course formats and they would need to change their
+ // functions to pass it along again...
+ $this->includesectionnum = $sectionnum;
+ } else {
+ $this->includesectionnum = false;
+ }
+
+ // Load the course sections into the page
+ $sections = $this->load_course_sections($course, $coursenode);
+ if ($course->id != SITEID) {
+ // Find the section for the $CM associated with the page and collect
+ // its section number.
if ($sectionnum) {
- // This value has to be stored in a member variable because
- // otherwise we would have to pass it through a public API
- // to course formats and they would need to change their
- // functions to pass it along again...
- $this->includesectionnum = $sectionnum;
+ $cm->sectionnumber = $sectionnum;
} else {
- $this->includesectionnum = false;
- }
-
- // Load the course sections into the page
- $sections = $this->load_course_sections($course, $coursenode);
- if ($course->id != SITEID) {
- // Find the section for the $CM associated with the page and collect
- // its section number.
- if ($sectionnum) {
- $cm->sectionnumber = $sectionnum;
- } else {
- foreach ($sections as $section) {
- if ($section->id == $cm->section) {
- $cm->sectionnumber = $section->section;
- break;
- }
+ foreach ($sections as $section) {
+ if ($section->id == $cm->section) {
+ $cm->sectionnumber = $section->section;
+ break;
}
}
+ }
- // Load all of the section activities for the section the cm belongs to.
- if (isset($cm->sectionnumber) and !empty($sections[$cm->sectionnumber])) {
- list($sectionarray, $activityarray) = $this->generate_sections_and_activities($course);
- $activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, $activityarray);
- } else {
- $activities = array();
- if ($activity = $this->load_stealth_activity($coursenode, get_fast_modinfo($course))) {
- // "stealth" activity from unavailable section
- $activities[$cm->id] = $activity;
- }
- }
+ // Load all of the section activities for the section the cm belongs to.
+ if (isset($cm->sectionnumber) and !empty($sections[$cm->sectionnumber])) {
+ list($sectionarray, $activityarray) = $this->generate_sections_and_activities($course);
+ $activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, $activityarray);
} else {
$activities = array();
- $activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY);
- }
- if (!empty($activities[$cm->id])) {
- // Finally load the cm specific navigaton information
- $this->load_activity($cm, $course, $activities[$cm->id]);
- // Check if we have an active ndoe
- if (!$activities[$cm->id]->contains_active_node() && !$activities[$cm->id]->search_for_active_node()) {
- // And make the activity node active.
- $activities[$cm->id]->make_active();
+ if ($activity = $this->load_stealth_activity($coursenode, get_fast_modinfo($course))) {
+ // "stealth" activity from unavailable section
+ $activities[$cm->id] = $activity;
}
- } else {
- //TODO: something is wrong, what to do? (Skodak)
}
- break;
- case CONTEXT_USER :
- $course = $this->page->course;
- if ($showcategories && !$ismycourse) {
- $this->load_all_categories($course->category, $showcategories);
+ } else {
+ $activities = array();
+ $activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY);
+ }
+ if (!empty($activities[$cm->id])) {
+ // Finally load the cm specific navigaton information
+ $this->load_activity($cm, $course, $activities[$cm->id]);
+ // Check if we have an active ndoe
+ if (!$activities[$cm->id]->contains_active_node() && !$activities[$cm->id]->search_for_active_node()) {
+ // And make the activity node active.
+ $activities[$cm->id]->make_active();
}
- // Load the course associated with the user into the navigation
- $coursenode = $this->load_course($course);
+ } else {
+ //TODO: something is wrong, what to do? (Skodak)
+ }
+ break;
+ case CONTEXT_USER :
+ if ($issite) {
+ // The users profile information etc is already loaded
+ // for the front page.
+ break;
+ }
+ $course = $this->page->course;
+ if ($showcategories && !$ismycourse) {
+ $this->load_all_categories($course->category, $showcategories);
+ }
+ // Load the course associated with the user into the navigation
+ $coursenode = $this->load_course($course);
- // If the course wasn't added then don't try going any further.
- if (!$coursenode) {
- $canviewcourseprofile = false;
- break;
- }
+ // If the course wasn't added then don't try going any further.
+ if (!$coursenode) {
+ $canviewcourseprofile = false;
+ break;
+ }
- // If the user is not enrolled then we only want to show the
- // course node and not populate it.
- if (!can_access_course($course)) {
- $coursenode->make_active();
- $canviewcourseprofile = false;
- break;
- }
- $this->add_course_essentials($coursenode, $course);
- $sections = $this->load_course_sections($course, $coursenode);
+ // If the user is not enrolled then we only want to show the
+ // course node and not populate it.
+ if (!can_access_course($course)) {
+ $coursenode->make_active();
+ $canviewcourseprofile = false;
break;
- }
- } else {
- // We need to check if the user is viewing a front page module.
- // If so then there is potentially more content to load yet for that
- // module.
- if ($this->page->context->contextlevel == CONTEXT_MODULE) {
- $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY);
- if ($activitynode) {
- $this->load_activity($this->page->cm, $this->page->course, $activitynode);
}
- }
+ $this->add_course_essentials($coursenode, $course);
+ $sections = $this->load_course_sections($course, $coursenode);
+ break;
}
$limit = 20;
@@ -1413,7 +1429,9 @@ public function initialise() {
protected function show_categories() {
global $CFG, $DB;
if ($this->showcategories === null) {
- $this->showcategories = !empty($CFG->navshowcategories) && $DB->count_records('course_categories') > 1;
+ $show = $this->page->context->contextlevel == CONTEXT_COURSECAT;
+ $show = $show || (!empty($CFG->navshowcategories) && $DB->count_records('course_categories') > 1);
+ $this->showcategories = $show;
}
return $this->showcategories;
}
@@ -1467,13 +1485,16 @@ protected function load_all_courses($categoryids=null) {
$categoryselect = '';
}
- list($ccselect, $ccjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+ $ccselect = context_helper::get_preload_record_columns_sql('ctx');
+ $params['contextlevel'] = CONTEXT_COURSE;
list($courseids, $courseparams) = $DB->get_in_or_equal(array_keys($this->addedcourses) + array(SITEID), SQL_PARAMS_NAMED, 'lcourse', false);
- $sql = "SELECT c.id, c.sortorder, c.visible, c.fullname, c.shortname, c.category, cat.path AS categorypath $ccselect
+ $sql = "SELECT c.id, c.sortorder, c.visible, c.fullname, c.shortname, c.category, cat.path AS categorypath, $ccselect
FROM {course} c
- $ccjoin
+ JOIN {context} ctx ON c.id = ctx.instanceid
LEFT JOIN {course_categories} cat ON cat.id=c.category
- WHERE c.id {$courseids} {$categoryselect}
+ WHERE c.id {$courseids} AND
+ ctx.contextlevel = :contextlevel
+ {$categoryselect}
ORDER BY c.sortorder ASC";
$limit = 20;
if (!empty($CFG->navcourselimit)) {
@@ -1483,7 +1504,7 @@ protected function load_all_courses($categoryids=null) {
$coursenodes = array();
foreach ($courses as $course) {
- context_instance_preload($course);
+ context_helper::preload_from_record($course);
$coursenodes[$course->id] = $this->add_course($course);
}
return $coursenodes;
@@ -1963,10 +1984,14 @@ protected function load_for_user($user=null, $forceforcontext=false) {
$user = $USER;
} else if (!is_object($user)) {
// If the user is not an object then get them from the database
- list($select, $join) = context_instance_preload_sql('u.id', CONTEXT_USER, 'ctx');
- $sql = "SELECT u.* $select FROM {user} u $join WHERE u.id = :userid";
- $user = $DB->get_record_sql($sql, array('userid' => (int)$user), MUST_EXIST);
- context_instance_preload($user);
+ $select = context_helper::get_preload_record_columns_sql('ctx');
+ $sql = "SELECT u.*, $select
+ FROM {user} u
+ JOIN {context} ctx ON u.id = ctx.instanceid
+ WHERE u.id = :userid AND
+ ctx.contextlevel = :contextlevel";
+ $user = $DB->get_record_sql($sql, array('userid' => (int)$user, 'contextlevel' => CONTEXT_USER), MUST_EXIST);
+ context_helper::preload_from_record($user);
}
$iscurrentuser = ($user->id == $USER->id);
@@ -3682,10 +3707,14 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
if (!empty($this->page->course->id) && $this->page->course->id == $courseid) {
$course = $this->page->course;
} else {
- list($select, $join) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
- $sql = "SELECT c.* $select FROM {course} c $join WHERE c.id = :courseid";
- $course = $DB->get_record_sql($sql, array('courseid' => $courseid), MUST_EXIST);
- context_instance_preload($course);
+ $select = context_helper::get_preload_record_columns_sql('ctx');
+ $sql = "SELECT c.*, $select
+ FROM {course} c
+ JOIN {context} ctx ON c.id = ctx.instanceid
+ WHERE c.id = :courseid AND ctx.contextlevel = :contextlevel";
+ $params = array('courseid' => $courseid, 'contextlevel' => CONTEXT_COURSE);
+ $course = $DB->get_record_sql($sql, $params, MUST_EXIST);
+ context_helper::preload_from_record($course);
}
} else {
$course = $SITE;
@@ -3699,14 +3728,17 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
$user = $USER;
$usercontext = get_context_instance(CONTEXT_USER, $user->id); // User context
} else {
-
- list($select, $join) = context_instance_preload_sql('u.id', CONTEXT_USER, 'ctx');
- $sql = "SELECT u.* $select FROM {user} u $join WHERE u.id = :userid";
- $user = $DB->get_record_sql($sql, array('userid' => $userid), IGNORE_MISSING);
+ $select = context_helper::get_preload_record_columns_sql('ctx');
+ $sql = "SELECT u.*, $select
+ FROM {user} u
+ JOIN {context} ctx ON u.id = ctx.instanceid
+ WHERE u.id = :userid AND ctx.contextlevel = :contextlevel";
+ $params = array('userid' => $userid, 'contextlevel' => CONTEXT_USER);
+ $user = $DB->get_record_sql($sql, $params, IGNORE_MISSING);
if (!$user) {
return false;
}
- context_instance_preload($user);
+ context_helper::preload_from_record($user);
// Check that the user can view the profile
$usercontext = get_context_instance(CONTEXT_USER, $user->id); // User context
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 3062ac629a0b5..7a457a4a89b12 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -123,3 +123,6 @@
#page-course-index.dir-rtl .category .image {padding-left: 5px; padding-right: 0px;}
#page-course-index.dir-rtl .indentation {padding-left: 0px;padding-right: 30px;}
+
+table.category_subcategories {margin-bottom:1em;}
+table.category_subcategories td {white-space: nowrap;}
\ No newline at end of file