+ (Core) Fixed Group List Block Root Group not being set. (Fixes #5331)

SparkDevNetwork · Apr 6, 2023 · 37e2ca9 · 37e2ca9
1 parent 38806ac
commit 37e2ca9
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/RockWeb/Blocks/Groups/GroupList.ascx.cs b/RockWeb/Blocks/Groups/GroupList.ascx.cs
@@ -778,6 +778,16 @@ private void BindGrid()
             var qryGroups = groupService.Queryable()
                 .Where( g => groupTypeIds.Contains( g.GroupTypeId ) && ( !onlySecurityGroups || g.IsSecurityRole ) );
 
+            var rootGroupGuid = GetAttributeValue( AttributeKey.RootGroup ).AsGuidOrNull();
+            if ( rootGroupGuid.HasValue )
+            {
+                var parentGroup = groupService.Get( rootGroupGuid.Value );
+                if ( parentGroup != null )
+                {
+                    qryGroups = qryGroups.Where( g => g.ParentGroupId == parentGroup.Id );
+                }
+            }
+
             string limitToActiveStatus = GetAttributeValue( "LimittoActiveStatus" );
 
             bool showActive = true;