...
- Need to evaluate whether to port/refactor the following changes
- SAK-1746 Adhoc groups interfere with grading
- SAK-764Gradebook : GradeDownloadConfig.properties points to ips instead of classes
- SAK-1062 Error generated in Gradebook when submitting a points grade to a gb item which will not be included in the course grade.
- SAK-1348 Hide Begin Final Grading button from TA's
- SAK-935 Refactor gradebook modifications for 2.4
- SAK-936 add site memberships (back) into default (all sections) views of roster and course grades
SAK-1746 "Adhoc groups interfere with grading"
r4417 /gradebook/branches/post_2-4-0/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
...
| No Format |
|---|
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());
|
Looks like the code has changed extensively here. I can't even find the method that we patched, as it's been broken up into about four other methods and each one delegates the info gathering to AuthzSectionsImpl. Interesting.
Melete : SAK-1833
Content Hosting, Resource Conversion : SAK-????
...