diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 3a9f715c42e8..8fec374ae6e6 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -21,6 +21,7 @@
from lti_consumer.models import CourseAllowPIISharingInLTIFlag
from opaque_keys.edx.keys import CourseKey, UsageKey
from opaque_keys.edx.locator import LibraryLocator
+from openedx.core.lib.teams_config import CONTENT_GROUPS_FOR_TEAMS, TEAM_SCHEME
from openedx_events.content_authoring.data import DuplicatedXBlockData
from openedx_events.content_authoring.signals import XBLOCK_DUPLICATED
from openedx_events.learning.data import CourseNotificationData
@@ -2146,6 +2147,12 @@ def get_group_configurations_context(course, store):
# Add it to the front of the list if it should be shown.
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
+ )
+ if should_show_team_partitions:
+ displayable_partitions.append(partition)
elif partition['scheme'] != RANDOM_SCHEME:
# Experiment group configurations are handled explicitly above. We don't
# want to display their groups twice.
diff --git a/cms/static/js/views/pages/group_configurations.js b/cms/static/js/views/pages/group_configurations.js
index 680bbda6593a..04de16838bb5 100644
--- a/cms/static/js/views/pages/group_configurations.js
+++ b/cms/static/js/views/pages/group_configurations.js
@@ -25,6 +25,7 @@ function($, _, gettext, BasePage, GroupConfigurationsListView, PartitionGroupLis
currentScheme = this.allGroupConfigurations[i].get('scheme');
this.allGroupViewList.push(
new PartitionGroupListView({
+ id: this.allGroupConfigurations[i].get('id'),
collection: this.allGroupConfigurations[i].get('groups'),
restrictEditing: this.allGroupConfigurations[i].get('read_only'),
scheme: currentScheme
@@ -43,7 +44,7 @@ function($, _, gettext, BasePage, GroupConfigurationsListView, PartitionGroupLis
// Render the remaining Configuration groups
for (i = 0; i < this.allGroupViewList.length; i++) {
- currentClass = '.wrapper-groups.content-groups.' + this.allGroupViewList[i].scheme;
+ currentClass = `.wrapper-groups.content-groups.${this.allGroupViewList[i].scheme}.${this.allGroupViewList[i].id}`;
this.$(currentClass).append(this.allGroupViewList[i].render().el);
}
diff --git a/cms/templates/group_configurations.html b/cms/templates/group_configurations.html
index 9e247d3d2740..607cbc965321 100644
--- a/cms/templates/group_configurations.html
+++ b/cms/templates/group_configurations.html
@@ -54,7 +54,7 @@