Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -r59c7126c918d80a824dfe52363fa1ab1785d082d -r2f527006e6e1e214dd86ccecb8782bfe27df1e24 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 59c7126c918d80a824dfe52363fa1ab1785d082d) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 2f527006e6e1e214dd86ccecb8782bfe27df1e24) @@ -121,20 +121,16 @@ for(Object userOrganisationRole:userOrganisation.getUserOrganisationRoles()){ roles.add(((UserOrganisationRole)userOrganisationRole).getRole().getRoleId()); } - for(Integer roleId:roles){ - log.debug("role:"+roleId); - } orgBeans.add(createOrgBean(userOrganisation.getOrganisation(),roles,request.getRemoteUser(),false)); } } - log.debug("set orgBeans in request"); request.setAttribute("orgBeans",orgBeans); return mapping.findForward("index"); } @SuppressWarnings({"unchecked","static-access"}) private IndexOrgBean createOrgBean(Organisation org, List roles, String username, boolean isSysAdmin) { - log.debug("creating orgBean for org:"+org.getName()); + //log.debug("creating orgBean for org:"+org.getName()); User user = (User)getService().findByProperty(User.class, "login",username).get(0); IndexOrgBean orgBean = new IndexOrgBean(org.getName(), org.getOrganisationType().getOrganisationTypeId()); List links = new ArrayList(); @@ -224,9 +220,7 @@ } private boolean contains(List roles, Integer roleId) { - log.debug("roleId:"+roleId); for (int i = 0; i < roles.size(); i++) { - log.debug(roles.get(i)); if (roleId.equals(roles.get(i))) return true; }