Page Comparison

Index: app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
===================================================================
--- app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java	(revision 4416)
+++ app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java	(revision 4417)
@@ -45,6 +45,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.sakaiproject.section.api.coursemanagement.CourseSection;
 import org.sakaiproject.section.api.coursemanagement.EnrollmentRecord;
+import org.sakaiproject.section.api.coursemanagement.LearningContext;
 import org.sakaiproject.service.gradebook.shared.UnknownUserException;
 import org.sakaiproject.tool.gradebook.Category;
 import org.sakaiproject.tool.gradebook.GradingEvent;
@@ -237,7 +238,19 @@
 			i = officialEnrollments.iterator();
 			while(i.hasNext()){
 				EnrollmentRecord r = (EnrollmentRecord) i.next();
-				enrMap.put(r.getUser().getUserUid(), r);
+				// since ad hoc groups will end up in here make sure provided enrollments
+				// are not overridden by them
+				LearningContext lc = r.getLearningContext();
+				boolean add = false;
+				if(lc instanceof CourseSection) { 
+					//just to make sure, shouldn't add anything that is not of this ilk anyways
+					CourseSection s = (CourseSection)lc;
+					if(null!=s.getEid() || 
+							!enrMap.containsKey(r.getUser().getUserUid())) {
+						add=true;
+					}				
+				}
+				if(add) enrMap.put(r.getUser().getUserUid(), r);
 			}
 			
 			enrollments = new ArrayList<Object>(enrMap.size());