Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -r4030a9f8250c89d2e8be1a41af9aeeac44c00383 -rd5528ef3c1216ab627a7576df65bf979d02798d3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 4030a9f8250c89d2e8be1a41af9aeeac44c00383) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision d5528ef3c1216ab627a7576df65bf979d02798d3) @@ -171,8 +171,7 @@ uorDTO.setOrgName(uo.getOrganisation().getName()); uorDTO.setRoles(roles); List childDTOs = new ArrayList(); -/* JunDir - please fix! - * List childuos = service.getUserOrganisationsForUserByTypeAndStatusAndParent( + List childuos = service.getUserOrganisationsForUserByTypeAndStatusAndParent( user.getLogin(), OrganisationType.CLASS_TYPE, OrganisationState.ACTIVE, @@ -189,7 +188,7 @@ } uorDTO.setChildDTOs(childDTOs); uorDTOs.add(uorDTO); -*/ } + } return uorDTOs; }