From: skodak <skodak>
Date: Mon, 4 May 2009 13:15:00 +0000 (+0000)
Subject: MDL-19052 separate group mode improvements and fixes; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=666979d32b9aa0f8b6a9dd9305346955fc653caa;p=moodle.git

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 462c7085fa..ae5db0e3c8 100755
--- 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 db4059d94f..09a7dc995d 100755
--- 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 f03d262687..e426b6aa2e 100755
--- 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 3047a7eb8d..c28ccd24ba 100755
--- 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);