SAK-29080 Export list also filtered by roleId

chc24 · Feb 18, 2015 · d9d8bff · d9d8bff
1 parent fd42e6a
commit d9d8bff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/roster2/src/java/org/sakaiproject/roster/tool/entityprovider/RosterPOIEntityProvider.java b/roster2/src/java/org/sakaiproject/roster/tool/entityprovider/RosterPOIEntityProvider.java
@@ -85,6 +85,7 @@ public class RosterPOIEntityProvider extends AbstractEntityProvider implements
 
 	// key passed as parameters
 	public final static String KEY_GROUP_ID				= "groupId";
+	public final static String KEY_ROLE_ID				= "roleId";
 	public final static String KEY_VIEW_TYPE			= "viewType";
 	public final static String KEY_BY_GROUP				= "byGroup";
 	public final static String KEY_ENROLLMENT_SET_ID	= "enrollmentSetId";
@@ -215,6 +216,7 @@ private void export(String currentUserId, HttpServletResponse response, RosterSi
 		String groupId = getGroupIdValue(parameters);
 		String viewType = getViewTypeValue(parameters);
 		boolean byGroup = getByGroupValue(parameters);
+		String roleId = getRoleIdValue(parameters);
 
 		String enrollmentSetId = getEnrollmentSetIdValue(parameters);
 		String enrollmentStatus = getEnrollmentStatusValue(parameters);
@@ -241,7 +243,7 @@ private void export(String currentUserId, HttpServletResponse response, RosterSi
 
 		if (VIEW_OVERVIEW.equals(viewType)) {
 
-			List<RosterMember> rosterMembers = getMembership(currentUserId, site.getId(), groupId);
+			List<RosterMember> rosterMembers = getMembership(currentUserId, site.getId(), groupId,roleId);
 
 			if (null != rosterMembers) {
 				addOverviewRows(dataInRows, rosterMembers, header, site.getId());
@@ -271,14 +273,14 @@ private void export(String currentUserId, HttpServletResponse response, RosterSi
 		response.getOutputStream().close();
 	}
 
-	private List<RosterMember> getMembership(String userId, String siteId, String groupId) {
+	private List<RosterMember> getMembership(String userId, String siteId, String groupId,String roleId) {
 
 		List<RosterMember> rosterMembers;
 
 		if (DEFAULT_GROUP_ID.equals(groupId)) {
-			rosterMembers = sakaiProxy.getMembership(userId, siteId, null, null, null, null);
+			rosterMembers = sakaiProxy.getMembership(userId, siteId, null, roleId, null, null);
 		} else {
-			rosterMembers = sakaiProxy.getMembership(userId, siteId, groupId, null, null, null);
+			rosterMembers = sakaiProxy.getMembership(userId, siteId, groupId, roleId, null, null);
 		}
 
 		if (null == rosterMembers) {
@@ -498,6 +500,14 @@ private String getGroupIdValue(Map<String, Object> parameters) {
 		}
 		return null;
 	}
+
+	private String getRoleIdValue(Map<String, Object> parameters) {
+
+		if (null != parameters.get(KEY_ROLE_ID)) {
+			return parameters.get(KEY_ROLE_ID).toString();
+		}
+		return null;
+	}
 
 	private List<String> createColumnHeader(Map<String, Object> parameters,
 			String viewType, String siteId) {

diff --git a/roster2/src/webapp/js/roster.js b/roster2/src/webapp/js/roster.js
@@ -663,7 +663,11 @@
             } else {
                 groupId = roster.DEFAULT_GROUP_ID;
             }
-
+
+            if (null != roster.roleToView) {
+                baseUrl += "&roleId=" + roster.roleToView;
+            }
+
             window.location.href = baseUrl + "&groupId=" + groupId + facetParams;
         } else if (roster.STATE_ENROLLMENT_STATUS === roster.currentState) {