diff --git a/src/client/app/js/app/state/CourseCategories.js b/src/client/app/js/app/state/CourseCategories.js index 3f2de62..ad457e5 100644 --- a/src/client/app/js/app/state/CourseCategories.js +++ b/src/client/app/js/app/state/CourseCategories.js @@ -30,7 +30,9 @@ app.state.CourseCategories = function() 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true, + activeOnly: true }, function( res ) { diff --git a/src/server/server/control/TB_Server_Control_Team.php b/src/server/server/control/TB_Server_Control_Team.php index 81d3093..de6130f 100644 --- a/src/server/server/control/TB_Server_Control_Team.php +++ b/src/server/server/control/TB_Server_Control_Team.php @@ -83,6 +83,7 @@ class TB_Server_Control_Team { $includeEmail = $params->get( 'includeEmails' ); $adminsOnly = $params->get( 'adminsOnly' ); $includeMembers = $params->get( 'includeMembers' ); + $activeOnly = $params->get( 'activeOnly'); $members = array(); $sessionProfile = TB_Server_Core_Session::get()->getProfile(); @@ -113,7 +114,14 @@ class TB_Server_Control_Team { $filteredMembers[] = $member; } } else { - $filteredMembers[] = $member; + if ($activeOnly === true) { + $teamData = $member->getTeamsData($teamId); + if ($teamData['status'] === TB_Shared_Ent_TeamData_Profile::STATUS_ACTIVE) { + $filteredMembers[] = $member; + } + } else { + $filteredMembers[] = $member; + } } } }