fix: enable teams with content groups connection only if teams is enabled

Author: BryanttV

cms/djangoapps/contentstore/utils.py

@@ -2197,8 +2197,10 @@ def get_group_configurations_context(course, store):
             if should_show_enrollment_track:
                 displayable_partitions.insert(0, partition)
         elif partition['scheme'] == TEAM_SCHEME:
-            should_show_team_partitions = len(partition['groups']) > 0 and CONTENT_GROUPS_FOR_TEAMS.is_enabled(
-                course_key
+            should_show_team_partitions = (
+                course.teams_enabled
+                and len(partition["groups"]) > 0
+                and CONTENT_GROUPS_FOR_TEAMS.is_enabled(course_key)
             )
             if should_show_team_partitions:
                 displayable_partitions.append(partition)

cms/djangoapps/models/settings/course_metadata.py

@@ -316,7 +316,7 @@ def fill_teams_user_partitions_ids(cls, block, teams_config):
         This is used by the Dynamic Team Partition Generator to create the dynamic user partitions
         based on the team-sets defined in the course.
         """
-        if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(block.id):
+        if not block.teams_enabled or not CONTENT_GROUPS_FOR_TEAMS.is_enabled(block.id):
             return teams_config
 
         for team_set in teams_config.teamsets:

lms/djangoapps/teams/team_partition_scheme.py

@@ -14,6 +14,7 @@
 from lms.djangoapps.teams.models import CourseTeamMembership
 from openedx.core.lib.teams_config import CONTENT_GROUPS_FOR_TEAMS
 
+from xmodule.modulestore.django import modulestore
 from xmodule.partitions.partitions import (  # lint-amnesty, pylint: disable=wrong-import-order
     Group,
     UserPartition
@@ -81,7 +82,8 @@ def get_group_for_user(cls, course_key, user, user_partition):
         Returns:
             Group: The group in the specified user partition
         """
-        if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course_key):
+        course = modulestore().get_course(course_key)
+        if not course.teams_enabled or not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course_key):
             return None
 
         # First, check if we have to deal with masquerading.
@@ -128,7 +130,8 @@ def create_user_partition(cls, id, name, description, groups=None, parameters=No
             TeamUserPartition: The user partition.
         """
         course_key = CourseKey.from_string(parameters["course_id"])
-        if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course_key):
+        course = modulestore().get_course(course_key)
+        if not course.teams_enabled and not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course_key):
             return None
 
         # Team-set used to create partition was created before this feature was

openedx/core/djangoapps/content/learning_sequences/api/processors/team_partition_groups.py

@@ -10,6 +10,7 @@
 from openedx.core import types
 from openedx.core.djangoapps.content.learning_sequences.api.processors.base import OutlineProcessor
 from openedx.core.lib.teams_config import create_team_set_partitions_with_course_id, CONTENT_GROUPS_FOR_TEAMS
+from xmodule.modulestore.django import modulestore
 from xmodule.partitions.partitions import Group
 from xmodule.partitions.partitions_service import get_user_partition_groups
 
@@ -37,7 +38,8 @@ def load_data(self, _) -> None:
         """
         Pull team groups for this course and which group the user is in.
         """
-        if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(self.course_key):
+        course = modulestore().get_course(self.course_key)
+        if not course.teams_enabled or not CONTENT_GROUPS_FOR_TEAMS.is_enabled(self.course_key):
             return
 
         user_partitions = create_team_set_partitions_with_course_id(self.course_key)
@@ -61,7 +63,8 @@ def _is_user_excluded_by_partition_group(self, user_partition_groups):
             The user is excluded from the content if and only if, for a non-empty
             partition group, the user is not in any of the groups for that partition.
         """
-        if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(self.course_key):
+        course = modulestore().get_course(self.course_key)
+        if not course.teams_enabled or not CONTENT_GROUPS_FOR_TEAMS.is_enabled(self.course_key):
             return False
 
         if not user_partition_groups:

openedx/core/lib/teams_config.py

@@ -400,7 +400,7 @@ def create_team_set_partition(course):
     """
     Get the dynamic enrollment track user partition based on the team-sets of the course.
     """
-    if not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course.id):
+    if not course.teams_enabled or not CONTENT_GROUPS_FOR_TEAMS.is_enabled(course.id):
         return []
     return create_team_set_partitions_with_course_id(
         course.id,