MDL-19052 separate group mode improvements and fixes; merged from MOODLE_19_STABLE

diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index 3f7b9bbdd95fe1d07c832142f00d3ef7d4921fb3..df607339c331f6644dd26a482ae8e989be565136 100644 (file)
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -90,10 +90,15 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     $isseparategroups = ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context));
 
     if ($isseparategroups and (!$currentgroup)) {
-        print_grade_page_head($courseid, 'report', 'overview', get_string('modulename', 'gradereport_overview'));
-        print_heading(get_string("notingroup"));
-        print_footer($course);
-        exit;
+        // no separate group access, can view only self
+        $userid = $USER->id;
+        $user_selector = '';
+    } else {
+        /// Print graded user selector at the top
+        $user_selector = '<div id="graded_users_selector">';
+        $user_selector .= print_graded_users_selector($course, 'report/overview/index.php?id=' . $course->id, $userid, $currentgroup, true, true);
+        $user_selector .= '</div>';
+        $user_selector .= "<p style = 'page-break-after: always;'></p>";
     }
 
     /// Print graded user selector at the top

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index 7134d6476c4552bb634046d354df893dfeeddb76..62f3c6462e8d569708eacee98ee2ab97d411f414 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -91,18 +91,17 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     $isseparategroups = ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context));
 
     if ($isseparategroups and (!$currentgroup)) {
-        print_grade_page_head($courseid, 'report', 'user', get_string('modulename', 'gradereport_user'));
-        print_heading(get_string("notingroup"));
-        print_footer($course);
-        exit;
+        // no separate group access, can view only self
+        $userid = $USER->id;
+        $user_selector = '';
+    } else {
+        /// Print graded user selector at the top
+        $user_selector = '<div id="graded_users_selector">';
+        $user_selector .= print_graded_users_selector($course, 'report/user/index.php?id=' . $course->id, $userid, $currentgroup, true, true);
+        $user_selector .= '</div>';
+        $user_selector .= "<p style = 'page-break-after: always;'></p>";
     }
 
-    /// Print graded user selector at the top
-    $user_selector = '<div id="graded_users_selector">';
-    $user_selector .= print_graded_users_selector($course, 'report/user/index.php?id=' . $course->id, $userid, $currentgroup, true, true);
-    $user_selector .= '</div>';
-    $user_selector .= "<p style = 'page-break-after: always;'></p>";
-
     if (empty($userid)) {
         $gui = new graded_users_iterator($course, null, $currentgroup);
         $gui->init();