Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rb25a6d2d1cebe3c69d4af018aa14198533a0d4c5 -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java =================================================================== diff -u -r20a2c3a6cd80bcf92989b3fa1e566ab93fa99afa -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision 20a2c3a6cd80bcf92989b3fa1e566ab93fa99afa) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -335,8 +335,8 @@ return false; } - public GroupDTO getGroupDTO(){ - return new GroupDTO(this); + public GroupDTO getGroupDTO(boolean setupUserList){ + return new GroupDTO(this, setupUserList); } /** May this group be deleted or a user from this group deleted? It should not be Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java =================================================================== diff -u -r11914f2354254e0e92e2a271453ba2f0e8a35fdc -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java (.../Grouping.java) (revision 11914f2354254e0e92e2a271453ba2f0e8a35fdc) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java (.../Grouping.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -344,8 +344,8 @@ { return !getGroupBy(learner).isNull(); } - public GroupingDTO getGroupingDTO(){ - return new GroupingDTO(this); + public GroupingDTO getGroupingDTO(boolean setupUserList){ + return new GroupingDTO(this, setupUserList); } public static Object getGroupingInstance(Integer groupingType){ if(groupingType.equals(RANDOM_GROUPING_TYPE)) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java =================================================================== diff -u -r11914f2354254e0e92e2a271453ba2f0e8a35fdc -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java (.../GroupDTO.java) (revision 11914f2354254e0e92e2a271453ba2f0e8a35fdc) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java (.../GroupDTO.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -45,13 +45,13 @@ * @param group */ @SuppressWarnings("unchecked") - public GroupDTO(Group group) { + public GroupDTO(Group group, boolean setupUserList) { groupID = group.getGroupId(); groupName = group.getGroupName(); orderID = group.getOrderId(); groupUIID = group.getGroupUIID(); userList = new ArrayList(); - if(group.getUsers() != null){ + if(setupUserList && group.getUsers() != null){ Iterator iter = group.getUsers().iterator(); while(iter.hasNext()){ userList.add(((User)iter.next()).getUserFlashDTO()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -64,7 +64,7 @@ this.maxNumberOfGroups = maxNumberOfGroups; this.groups = groupDTOs; } - public GroupingDTO(Grouping grouping){ + public GroupingDTO(Grouping grouping, boolean setupUserList){ this.groupingID = grouping.getGroupingId(); this.groupingUIID = grouping.getGroupingUIID(); this.maxNumberOfGroups = grouping.getMaxNumberOfGroups(); @@ -74,7 +74,7 @@ if(groupSet != null){ Iterator iter = groupSet.iterator(); while(iter.hasNext()){ - groups.add(((Group)iter.next()).getGroupDTO()); + groups.add(((Group)iter.next()).getGroupDTO(setupUserList)); } } /*The two lines of code below are commented out, because it creates a new grouping instance and then tries to Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -rb25a6d2d1cebe3c69d4af018aa14198533a0d4c5 -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision b25a6d2d1cebe3c69d4af018aa14198533a0d4c5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -393,8 +393,12 @@ /** * Gets all the grouping objects for a learning design. Can't do it via activities as the grouping * related to a teacher chosen grouping does not have a related grouping activity. + * + * Don't set up the userlist if this is to be sent to authoring. + * * @param design * @param groupingDAO DAO to directory get the grouping objects (no direct link from learning design possible). + * @param setupUserList * @return ArrayList the array of groupingDTOs */ public ArrayList populateGroupings(LearningDesign design, GroupingDAO groupingDAO) @@ -406,7 +410,7 @@ while (groupingIter.hasNext()) { Grouping grouping = (Grouping) groupingIter.next(); - groupingList.add(grouping.getGroupingDTO()); + groupingList.add(grouping.getGroupingDTO(false)); if ( grouping.getGroups().size() > 0 ) { Iterator iter = grouping.getGroups().iterator(); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r19a9225d5d9ba59e2600b57c3c8e968ffc9ee351 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java (.../PerformChosenGroupingServlet.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java (.../PerformChosenGroupingServlet.java) (revision 19a9225d5d9ba59e2600b57c3c8e968ffc9ee351) @@ -90,7 +90,7 @@ Grouping grouping = activity.getCreateGrouping(); Map map = new HashMap(); map.put(MonitoringConstants.KEY_GROUPING_ACTIVITY,new Long(activityId)); - map.put("grouping",grouping.getGroupingDTO()); + map.put("grouping",grouping.getGroupingDTO(true)); flashMessage = new FlashMessage("performChosenGrouping",map); } catch (Exception e) { log.error(e);