fixing bug #8050

Non active users are no more displayed in group-based orgchart
Silverpeas · Jul 12, 2016 · 5386f1e · 5386f1e
1 parent d1a718c
commit 5386f1e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...va/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java b/...va/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java
@@ -99,7 +99,10 @@ private List<OrganizationalPerson> getMembers(String groupId, String[] userIds,
     List<OrganizationalPerson> personList = new ArrayList<>(userIds.length);
 
     for (String userId : userIds) {
-      personList.add(loadOrganizationalPerson(userId, type));
+      OrganizationalPerson person = loadOrganizationalPerson(userId, type);
+      if (person != null) {
+        personList.add(person);
+      }
     }
     Collections.sort(personList, new OrganizationalPersonComparator());
     return personList;
@@ -108,6 +111,10 @@ private List<OrganizationalPerson> getMembers(String groupId, String[] userIds,
   private OrganizationalPerson loadOrganizationalPerson(String id, OrganizationalChartType type) {
     UserFull user = OrganizationControllerProvider.getOrganisationController().getUserFull(id);
 
+    if (!user.isActivatedState()) {
+      return null;
+    }
+
     String userFunction = user.getValue(config.getAttTitle());
     String userDescription = user.getValue(config.getAttDesc());
     String userService = user.getValue(config.getAttUnit());