Parcourir la source

filter active members

master
Daniel il y a 2 ans
Parent
révision
99a8252793
2 fichiers modifiés avec 12 ajouts et 2 suppressions
  1. +3
    -1
      src/client/app/js/app/state/CourseCategories.js
  2. +9
    -1
      src/server/server/control/TB_Server_Control_Team.php

+ 3
- 1
src/client/app/js/app/state/CourseCategories.js Voir le fichier

@@ -30,7 +30,9 @@ app.state.CourseCategories = function()
'Team', 'Team',
'getDetails', 'getDetails',
{ {
teamId : groupId
teamId : groupId,
includeMembers: true,
activeOnly: true
}, },
function( res ) function( res )
{ {


+ 9
- 1
src/server/server/control/TB_Server_Control_Team.php Voir le fichier

@@ -83,6 +83,7 @@ class TB_Server_Control_Team {
$includeEmail = $params->get( 'includeEmails' ); $includeEmail = $params->get( 'includeEmails' );
$adminsOnly = $params->get( 'adminsOnly' ); $adminsOnly = $params->get( 'adminsOnly' );
$includeMembers = $params->get( 'includeMembers' ); $includeMembers = $params->get( 'includeMembers' );
$activeOnly = $params->get( 'activeOnly');
$members = array(); $members = array();
$sessionProfile = TB_Server_Core_Session::get()->getProfile(); $sessionProfile = TB_Server_Core_Session::get()->getProfile();
@@ -113,7 +114,14 @@ class TB_Server_Control_Team {
$filteredMembers[] = $member; $filteredMembers[] = $member;
} }
} else { } 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;
}
} }
} }
} }


Chargement…
Annuler
Enregistrer