From 4ad2527e2eca62acb97eac8f5d3206213967fc18 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 26 Sep 2009 18:49:30 +0000 Subject: [PATCH] MDL-20355 teachers may not see overview of all students in course because they might not have access in all their courses - please use profile instead --- grade/report/overview/index.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php index ab5a5835749..3360f7b53df 100644 --- a/grade/report/overview/index.php +++ b/grade/report/overview/index.php @@ -30,10 +30,11 @@ if (!$course = get_record('course', 'id', $courseid)) { require_login($course); $context = get_context_instance(CONTEXT_COURSE, $course->id); +$systemcontext = get_context_instance(CONTEXT_SYSTEM); require_capability('gradereport/overview:view', $context); if (empty($userid)) { - require_capability('moodle/grade:viewall', $context); + require_capability('moodle/grade:viewall', $systemcontext); } else { if (!get_record('user', 'id', $userid, 'deleted', 0) or isguestuser($userid)) { @@ -42,12 +43,16 @@ if (empty($userid)) { } $access = false; -if (has_capability('moodle/grade:viewall', $context)) { +if (has_capability('moodle/grade:viewall', $systemcontext)) { //ok - can view all course grades $access = true; +} else if ($userid == $USER->id and has_capability('moodle/grade:viewall', $context)) { + //ok - can view any own grades + $access = true; + } else if ($userid == $USER->id and has_capability('moodle/grade:view', $context) and $course->showgrades) { - //ok - can view own grades + //ok - can view own course grades $access = true; } else if (has_capability('moodle/grade:viewall', get_context_instance(CONTEXT_USER, $userid)) and $course->showgrades) { @@ -72,7 +77,8 @@ $USER->grade_last_report[$course->id] = 'overview'; //first make sure we have proper final grades - this must be done before constructing of the grade tree grade_regrade_final_grades($courseid); -if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all student reports +if (has_capability('moodle/grade:viewall', $systemcontext)) { //Admins will see all student reports + // please note this would be extremely slow if we wanted to implement this properly for all teachers $groupmode = groups_get_course_groupmode($course); // Groups are being used $currentgroup = groups_get_course_group($course, true); @@ -122,7 +128,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all } } } -} else { //Students will see just their own report +} else { //Non-admins will see just their own report // Create a report instance $report = new grade_report_overview($userid, $gpr, $context);