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

diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php
index 462c7085fa06fff47a831157caf96f02c02e5be6..ae5db0e3c85ab87ace30b3534eae81830b334e8e 100755 (executable)
--- a/grade/export/ods/index.php
+++ b/grade/export/ods/index.php
@@ -47,9 +47,17 @@ if (!empty($CFG->gradepublishing)) {
 
 $mform = new grade_export_form(null, array('publishing' => true));
 
+$groupmode    = groups_get_course_groupmode($course);   // Groups are being used
+$currentgroup = groups_get_course_group($course, true);
+if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
+    print_heading(get_string("notingroup"));
+    print_footer($course);
+    die;    
+}
+
 // process post information
 if ($data = $mform->get_data()) {
-    $export = new grade_export_ods($course, groups_get_course_group($course), '', false, false, $data->display, $data->decimals);
+    $export = new grade_export_ods($course, $currentgroup, '', false, false, $data->display, $data->decimals);
 
     // print the grades on screen for feedbacks
     $export->process_form($data);

diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php
index db4059d94f11f93c92121837df51540f23dcd51c..09a7dc995d7d232d12ed0236bcd24a8646cb0c5f 100755 (executable)
--- a/grade/export/txt/index.php
+++ b/grade/export/txt/index.php
@@ -47,9 +47,17 @@ if (!empty($CFG->gradepublishing)) {
 
 $mform = new grade_export_form(null, array('includeseparator'=>true, 'publishing' => true));
 
+$groupmode    = groups_get_course_groupmode($course);   // Groups are being used
+$currentgroup = groups_get_course_group($course, true);
+if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
+    print_heading(get_string("notingroup"));
+    print_footer($course);
+    die;    
+}
+
 // process post information
 if ($data = $mform->get_data()) {
-    $export = new grade_export_txt($course, groups_get_course_group($course), '', false, false, $data->display, $data->decimals);
+    $export = new grade_export_txt($course, $currentgroup, '', false, false, $data->display, $data->decimals);
 
     // print the grades on screen for feedback
 

diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php
index f03d26268718517bc3783392832c28d50927bce3..e426b6aa2e27d41e842ed0faf92223a51625772d 100755 (executable)
--- a/grade/export/xls/index.php
+++ b/grade/export/xls/index.php
@@ -47,9 +47,17 @@ if (!empty($CFG->gradepublishing)) {
 
 $mform = new grade_export_form(null, array('publishing' => true));
 
+$groupmode    = groups_get_course_groupmode($course);   // Groups are being used
+$currentgroup = groups_get_course_group($course, true);
+if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
+    print_heading(get_string("notingroup"));
+    print_footer($course);
+    die;    
+}
+
 // process post information
 if ($data = $mform->get_data()) {
-    $export = new grade_export_xls($course, groups_get_course_group($course), '', false, false, $data->display, $data->decimals);
+    $export = new grade_export_xls($course, $currentgroup, '', false, false, $data->display, $data->decimals);
 
     // print the grades on screen for feedbacks
     $export->process_form($data);

diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php
index 3047a7eb8dc8c21a918729e62aa20fc18cf4b45d..c28ccd24ba1e8c88c535427fdf89eb1e1eea27e1 100755 (executable)
--- a/grade/export/xml/index.php
+++ b/grade/export/xml/index.php
@@ -47,9 +47,17 @@ if (!empty($CFG->gradepublishing)) {
 
 $mform = new grade_export_form(null, array('idnumberrequired'=>true, 'publishing'=>true, 'updategradesonly'=>true));
 
+$groupmode    = groups_get_course_groupmode($course);   // Groups are being used
+$currentgroup = groups_get_course_group($course, true);
+if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
+    print_heading(get_string("notingroup"));
+    print_footer($course);
+    die;    
+}
+
 // process post information
 if ($data = $mform->get_data()) {
-    $export = new grade_export_xml($course, groups_get_course_group($course), '', false, $data->updatedgradesonly, $data->display, $data->decimals);
+    $export = new grade_export_xml($course, $currentgroup, '', false, $data->updatedgradesonly, $data->display, $data->decimals);
 
     // print the grades on screen for feedbacks
     $export->process_form($data);