mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Addressing bug 1384:

Browse Source 
Now if you are a teacher in a course, you now see ALL group events in that course.
As a result, admins see group events for all courses.

Maybe it needs more work than this, though.
This commit is contained in:
defacer 2004-05-13 10:32:12 +00:00
parent b6b3deb48c
commit 6c9584d1e5
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
calendar/lib.php
View File

@ -1063,7 +1063,16 @@ function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL
if($SESSION->cal_show_groups) {
if(is_int($groupcourses)) {
// One course, whatever group the user is in that course
if(mygroupid($groupcourses)) {
if(isteacher($groupcourses, $USER->id)) {
$grouprecords = get_groups($groupcourses);
if($grouprecords === false) {
$group = false;
}
else {
$group = array_keys($grouprecords);
}
}
else if(mygroupid($groupcourses)) {
$group = mygroupid($groupcourses);
}
else {
@ -1072,24 +1081,27 @@ function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL
}
else if(is_array($groupcourses)) {
// Many courses, we want all of them
if(empty($USER->groupmember)) {
$grouparray = array();
// For each course...
foreach($groupcourses as $courseid => $dummy) {
// If the user is a teacher in there,
if(isteacher($courseid, $USER->id)) {
// Show events from all groups
if(($grouprecords = get_groups($courseid)) !== false) {
$grouparray = array_merge($grouparray, array_keys($grouprecords));
}
}
// Otherwise show events from the group he is a member of
else if(isset($USER->groupmember[$courseid])) {
$grouparray[] = $USER->groupmember[$courseid];
}
}
if(empty($grouparray)) {
$group = false;
}
else {
$grouparray = array();
foreach ($USER->groupmember as $courseid => $mgroupid) {
if (array_key_exists($courseid, $groupcourses)) {
$grouparray[] = $mgroupid;
}
}
if(!empty($grouparray)) {
// We got some groups at the least
$group = $grouparray;
}
else {
// No groups in these courses
$group = false;
}
$group = $grouparray;
}
}
else if(is_bool($groupcourses)) {