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

MDL-14908 user: Parents are not restricted when separated groups is used

Browse Source
This commit is contained in:
Frederic Massart
2014-12-01 15:16:03 +08:00
parent ab3effc0c6
commit c35dbd1e5b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+2 -2
View File
@@ -4134,8 +4134,8 @@ class settings_navigation extends navigation_node {
return false;
}
$canaccessallgroups = has_capability('moodle/site:accessallgroups', $coursecontext);
if (!$canaccessallgroups && groups_get_course_groupmode($course) == SEPARATEGROUPS) {
// If groups are in use, make sure we can see that group (MDL-45874).
if (!$canaccessallgroups && groups_get_course_groupmode($course) == SEPARATEGROUPS && !$canviewuser) {
// If groups are in use, make sure we can see that group (MDL-45874). That does not apply to parents.
if ($courseid == $this->page->course->id) {
$mygroups = get_fast_modinfo($this->page->course)->groups;
} else {
user/view.php
+6 -2
View File
@@ -142,8 +142,12 @@ if ($currentuser) {
}
// If groups are in use and enforced throughout the course, then make sure we can meet in at least one course level group.
if (groups_get_course_groupmode($course) == SEPARATEGROUPS and $course->groupmodeforce
and !has_capability('moodle/site:accessallgroups', $coursecontext) and !has_capability('moodle/site:accessallgroups', $coursecontext, $user->id)) {
// Except when we are a parent, in which case we would not be in any group.
if (groups_get_course_groupmode($course) == SEPARATEGROUPS
and $course->groupmodeforce
and !has_capability('moodle/site:accessallgroups', $coursecontext)
and !has_capability('moodle/site:accessallgroups', $coursecontext, $user->id)
and !$isparent) {
if (!isloggedin() or isguestuser()) {
// Do not use require_login() here because we might have already used require_login($course).
redirect(get_login_url());