moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-33466: Group restriction should hide activity even with 'show availability' option

Browse source 
This is a modified version of fix by Luke Tucker at NetSpot - thanks.
This commit is contained in:
sam marshall 2012-05-27 12:49:10 +08:00 • committed by Sam Hemelryk
parent 3bcca35591
commit 8530aac4a8
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/modinfolib.php
View file

@ -1086,18 +1086,24 @@ class cm_info extends stdClass {
$modcontext = get_context_instance(CONTEXT_MODULE, $this->id); $modcontext = get_context_instance(CONTEXT_MODULE, $this->id);
$userid = $this->modinfo->get_user_id(); $userid = $this->modinfo->get_user_id();
$this->uservisible = true; $this->uservisible = true;
// Check visibility/availability conditions.
if ((!$this->visible or !$this->available) and if ((!$this->visible or !$this->available) and
!has_capability('moodle/course:viewhiddenactivities', $modcontext, $userid)) { !has_capability('moodle/course:viewhiddenactivities', $modcontext, $userid)) {
// If the activity is hidden or unavailable, and you don't have viewhiddenactivities, // If the activity is hidden or unavailable, and you don't have viewhiddenactivities,
// set it so that user can't see or access it // set it so that user can't see or access it.
$this->uservisible = false; $this->uservisible = false;
} else if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly) }
// Check group membership. The grouping option makes the activity
// completely invisible as it does not apply to the user at all.
if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly)
and !has_capability('moodle/site:accessallgroups', $modcontext, $userid)) { and !has_capability('moodle/site:accessallgroups', $modcontext, $userid)) {
// If the activity has 'group members only' and you don't have accessallgroups... // If the activity has 'group members only' and you don't have accessallgroups...
$groups = $this->modinfo->get_groups($this->groupingid); $groups = $this->modinfo->get_groups($this->groupingid);
if (empty($groups)) { if (empty($groups)) {
// ...and you don't belong to a group, then set it so you can't see/access it // ...and you don't belong to a group, then set it so you can't see/access it
$this->uservisible = false; $this->uservisible = false;
// Ensure activity is completely hidden from user.
$this->showavailability = 0;
} }
} }
} }