Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r763fa73e0c5267c561a47be1154b5f1f7f80f767 -r1ffe3ee191320e11b82be7e50c5ac66f037732d7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 763fa73e0c5267c561a47be1154b5f1f7f80f767) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 1ffe3ee191320e11b82be7e50c5ac66f037732d7) @@ -27,6 +27,7 @@ import java.util.Vector; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; +import org.lamsfoundation.lams.usermanagement.IRolePrivilegeDAO; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -92,7 +93,14 @@ */ public void setLocaleDAO(ILocaleDAO localeDao); + /** + * Set IRolePrivilegeDAO + * + * @param rolePrivilegeDao + */ + public void setRolePrivilegeDAO(IRolePrivilegeDAO rolePrivilegeDao); + /** * Set IOrganisationDAO * @@ -268,7 +276,7 @@ */ public List getUserOrganisationsForUser(User user); - + /** * Retrieves roles in which the user * has the specified role @@ -459,5 +467,7 @@ public List getAllCountries(); public List getAllLanguages(); + + public List getRolePrivilegesByRoleId(Integer id); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r763fa73e0c5267c561a47be1154b5f1f7f80f767 -r1ffe3ee191320e11b82be7e50c5ac66f037732d7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 763fa73e0c5267c561a47be1154b5f1f7f80f767) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 1ffe3ee191320e11b82be7e50c5ac66f037732d7) @@ -34,6 +34,7 @@ import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; +import org.lamsfoundation.lams.usermanagement.IRolePrivilegeDAO; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -80,6 +81,8 @@ private IRoleDAO roleDAO; private ILocaleDAO localeDAO; + + private IRolePrivilegeDAO rolePrivilegeDAO; private IOrganisationDAO organisationDAO; @@ -680,7 +683,8 @@ return organisationTypeDAO.getOrganisationTypeById(typeId); } - public void setLocaleDAO(ILocaleDAO localeDao) { + public void setLocaleDAO(ILocaleDAO localeDAO) { + this.localeDAO = localeDAO; } public List getAllCountries() { @@ -690,4 +694,12 @@ public List getAllLanguages() { return localeDAO.getAllLanguages(); } + + public void setRolePrivilegeDAO(IRolePrivilegeDAO rolePrivilegeDAO) { + this.rolePrivilegeDAO = rolePrivilegeDAO; + } + + public List getRolePrivilegesByRoleId(Integer id) { + return rolePrivilegeDAO.getRolePrivilegesByRoleId(id); + } }