SAK-32730 Roster is not sorting properly for teaching assistants of more than one section (sakaiproject#4640)

juanjmerono · ern · commit d22035dba6cd · 2017-07-28T09:32:37.000-04:00
diff --git a/roster2/src/java/org/sakaiproject/roster/impl/SakaiProxyImpl.java b/roster2/src/java/org/sakaiproject/roster/impl/SakaiProxyImpl.java
@@ -483,6 +483,8 @@ private List<RosterMember> filterMembers(Site site, String currentUserId, List<R
 						filtered.addAll(filterHiddenMembers(unfiltered, currentUserId, site.getId(), group));
 					}
 				}
+				// The group loop is shuffling members, sort the list again
+				Collections.sort(filtered,memberComparator);
 			} else if (null != site.getGroup(groupId)) {
 				// get all members of requested groupId if current user is
 				// member

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,8 @@ private List<RosterMember> filterMembers(Site site, String currentUserId, List<R`
`483`	`483`	`filtered.addAll(filterHiddenMembers(unfiltered, currentUserId, site.getId(), group));`
`484`	`484`	`}`
`485`	`485`	`}`
	`486`	`+ // The group loop is shuffling members, sort the list again`
	`487`	`+ Collections.sort(filtered,memberComparator);`
`486`	`488`	`} else if (null != site.getGroup(groupId)) {`
`487`	`489`	`// get all members of requested groupId if current user is`
`488`	`490`	`// member`