MDL-10914 support for groupings in Database module

diff --git a/mod/data/edit.php b/mod/data/edit.php
index eb1e791876524e9e473073613312efff57c52f05..ff755855949e9522294d34d1204025ea74325a34 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -135,7 +135,6 @@
     } else {
         $groupselect = "";
         $groupparam = "";
-        $currentgroup = 0;
     }
 
 /// Print the tabs

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 3da777f721bc96bfce4ac05d4d495e55675971b1..01955febe71a2050063daedd03ec751e28570f87 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1180,6 +1180,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
     
     ///actual replacement of the tags
     $newtext = preg_replace($patterns, $replacement, $data->asearchtemplate);
+    $options = new object();
     $options->para=false;
     $options->noclean=true;
     echo '<tr><td>';
@@ -1395,7 +1396,7 @@ function data_print_comment($data, $comment, $page=0) {
     echo '</div></td></tr>';
 
     echo '<tr><td class="left side">';
-    if ($groups = groups_get_all_groups($data->course, $comment->userid)) {
+    if ($groups = groups_get_all_groups($data->course, $comment->userid, $cm->groupingid)) {
         print_group_picture($groups, $data->course, false, false, true);
     } else {
         echo '&nbsp;';
@@ -1574,14 +1575,10 @@ function data_convert_to_roles($data, $teacherroles=array(), $studentroles=array
         $cm = get_record('course_modules', 'id', $cmid);
     }
 
-    // $cm->groupmode:
-    // 0 - No groups
-    // 1 - Separate groups
-    // 2 - Visible groups
     switch ($cm->groupmode) {
-        case 0:
+        case NOGROUPS:
             break;
-        case 1:
+        case SEPARATEGROUPS:
             foreach ($studentroles as $studentrole) {
                 assign_capability('moodle/site:accessallgroups', CAP_PREVENT, $studentrole->id, $context->id);
             }
@@ -1589,7 +1586,7 @@ function data_convert_to_roles($data, $teacherroles=array(), $studentroles=array
                 assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $teacherrole->id, $context->id);
             }
             break;
-        case 2:
+        case VISIBLEGROUPS:
             foreach ($studentroles as $studentrole) {
                 assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $studentrole->id, $context->id);
             }
@@ -1700,8 +1697,7 @@ function data_print_header($course, $cm, $data, $currenttab='') {
     print_heading(format_string($data->name));
 
 /// Groups needed for Add entry tab
-    $groupmode = groupmode($course, $cm);
-    $currentgroup = get_and_set_current_group($course, $groupmode);
+    $currentgroup = groups_get_activity_group($cm);
 
     /// Print the tabs