Merge branch 'master' of codecrew.fi:bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/RoleBean.java

@@ -39,10 +39,10 @@ public class RoleBean implements RoleBeanLocal {
 
 
 	// private static final String PUBLIC_ROLE_NAME =
 	// private static final String PUBLIC_ROLE_NAME =
 	// BeanRole.ANONYMOUS.toString();
 	// BeanRole.ANONYMOUS.toString();
-	
+
 	@SuppressWarnings("unused")
 	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(RoleBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(RoleBean.class);
-	
+
 	@Resource
 	@Resource
 	private SessionContext sc;
 	private SessionContext sc;
 	@EJB
 	@EJB
@@ -172,12 +172,6 @@ public class RoleBean implements RoleBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	@RolesAllowed(UserPermission.S_READ_ROLES)
-	public List<Role> getRoles(EventUser user) {
-		return roleFacade.findForUser(user);
-	}
-
-	@Override
 	@RolesAllowed(UserPermission.S_WRITE_ROLES)
 	@RolesAllowed(UserPermission.S_WRITE_ROLES)
 	public void saveRoles(EventUser usr, List<Role> usersRoles) {
 	public void saveRoles(EventUser usr, List<Role> usersRoles) {
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java

@@ -34,6 +34,4 @@ public interface RoleBeanLocal {
 
 
 	public void saveRoles(EventUser usr, List<Role> usersRoles);
 	public void saveRoles(EventUser usr, List<Role> usersRoles);
 
 
-	List<Role> getRoles(EventUser user);
-
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java

@@ -130,6 +130,7 @@ public class UserView extends GenericCDIView {
 			usersRoles = rolebean.getRoles(getSelectedUser());
 			usersRoles = rolebean.getRoles(getSelectedUser());
 		}
 		}
 		return usersRoles;
 		return usersRoles;
+
 	}
 	}
 
 
 	public String crop()
 	public String crop()