Permalink
Browse files

Merge branch 'wip-MDL-32872-m21' of git://github.com/samhemelryk/mood…

…le into MOODLE_21_STABLE
  • Loading branch information...
2 parents 5f70593 + 7f51f30 commit 51c048b088c35fb0e62262fc7e0d28272bdc59fb @danpoltawski danpoltawski committed May 14, 2012
Showing with 11 additions and 5 deletions.
  1. +11 −5 admin/roles/usersroles.php
View
@@ -54,6 +54,17 @@
print_error('nopermissions', 'error', '', get_string('checkpermissions', 'role'));
}
+if ($userid != $USER->id) {
+ // If its not the current user we need to extend the navigation for that user to ensure
+ // their navigation is loaded and this page found upon it.
+ $PAGE->navigation->extend_for_user($user);
+}
+if ($course->id != $SITE->id || $userid != $USER->id) {
+ // If we're within a course OR if we're viewing another user then we need to include the
+ // settings base on the navigation to ensure that the navbar will contain the users name.
+ $PAGE->navbar->includesettingsbase = true;
+}
+
/// Now get the role assignments for this user.
$sql = "SELECT
ra.id, ra.userid, ra.contextid, ra.roleid, ra.component, ra.itemid,
@@ -119,14 +130,9 @@
$PAGE->set_title($title);
if ($courseid != SITEID) {
$PAGE->set_heading($fullname);
- if (has_capability('moodle/course:viewparticipants', $coursecontext)) {
- $PAGE->navbar->add(get_string('participants'),new moodle_url('/user/index.php', array('id'=>$courseid)));
- }
} else {
$PAGE->set_heading($course->fullname);
}
-$PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
-$PAGE->navbar->add($straction);
echo $OUTPUT->header();
echo $OUTPUT->heading($title, 3);
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');

0 comments on commit 51c048b

Please sign in to comment.