Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java =================================================================== diff -u -r6be225f8d21a7f927da78ca099fc8c3915d7668a -r1233d7630219a578085d60792930fba266fe15d4 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 6be225f8d21a7f927da78ca099fc8c3915d7668a) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 1233d7630219a578085d60792930fba266fe15d4) @@ -57,6 +57,7 @@ import org.lamsfoundation.lams.usermanagement.OrganisationGrouping; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dto.OrganisationGroupingDTO; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -309,7 +310,11 @@ List orgGroupings = userManagementService.findByProperty(OrganisationGrouping.class, "organisationId", organisationID); - req.setAttribute("orgGroupings", orgGroupings); + Set orgGroupingDTOs = new TreeSet<>(); + for (OrganisationGrouping orgGrouping : orgGroupings) { + orgGroupingDTOs.add(new OrganisationGroupingDTO(orgGrouping)); + } + req.setAttribute("orgGroupings", orgGroupingDTOs); return "addLesson"; } Index: lams_central/web/addLesson.jsp =================================================================== diff -u -rcbbc69c92d1efd85834d2c81b9203c8835438d85 -r1233d7630219a578085d60792930fba266fe15d4 --- lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision cbbc69c92d1efd85834d2c81b9203c8835438d85) +++ lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision 1233d7630219a578085d60792930fba266fe15d4) @@ -18,7 +18,8 @@ - + +