Groups - check if group is in a category.

chamilo · Nov 4, 2020 · 38e65c1 · 38e65c1
1 parent 57e9880
commit 38e65c1
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
@@ -88,6 +88,7 @@ public static function get_groups($courseId = 0)
      * @param int   $status      group status
      * @param int   $sessionId
      * @param bool  $getCount
+     * @param bool  $notInGroup  Get groups not in a category
      *
      * @return array an array with all information about the groups
      */
@@ -96,7 +97,8 @@ public static function get_group_list(
         $course_info = [],
         $status = null,
         $sessionId = 0,
-        $getCount = false
+        $getCount = false,
+        $notInGroup = false
     ) {
         $course_info = empty($course_info) ? api_get_course_info() : $course_info;
         if (empty($course_info)) {
@@ -142,6 +144,10 @@ public static function get_group_list(
 
         $sql .= " AND g.c_id = $course_id ";
 
+        if ($notInGroup) {
+            $sql .= "  AND (g.category_id IS NULL OR g.category_id = 0) ";
+        }
+
         if (!empty($session_condition)) {
             $sql .= $session_condition;
         }
@@ -2987,12 +2993,12 @@ public static function getOverview($courseId, $keyword = '')
         }
 
         // Check groups with no categories.
-        $groups = self::get_group_list();
+        $groups = self::get_group_list(null, api_get_course_info(), null, api_get_session_id(), false, true);
         if (!empty($groups)) {
             $content .= '<h2>'.get_lang('NoCategorySelected').'</h2>';
             $content .= '<ul>';
             foreach ($groups as $group) {
-                if (!empty($group['category'])) {
+                if (!empty($group['category_id'])) {
                     continue;
                 }
                 $content .= self::groupOverview($group, $url);