Commit dfa2ee61 by Tuomas Riihimäki

Merge branch 'tournamentParticipateBug' into 'master'

haettiin väärät roolit



See merge request !347
2 parents 28fa5fc7 98bed20c
...@@ -55,6 +55,9 @@ public class TournamentBean implements TournamentBeanLocal { ...@@ -55,6 +55,9 @@ public class TournamentBean implements TournamentBeanLocal {
@EJB @EJB
private TournamentTeamMemberFacade tournamentTeamMemberFacade; private TournamentTeamMemberFacade tournamentTeamMemberFacade;
@EJB
private UserBean userBean;
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -83,12 +86,15 @@ public class TournamentBean implements TournamentBeanLocal { ...@@ -83,12 +86,15 @@ public class TournamentBean implements TournamentBeanLocal {
return true; return true;
} }
List<Role> currentUserRoles = userBean.findUsersRoles(permissionBean.getCurrentUser());
for (Role r : tournament.getOpenForRoles()) { for (Role r : tournament.getOpenForRoles()) {
if (permissionBean.getCurrentUser().getRoles().contains(r)) { if (currentUserRoles.contains(r)) {
return true; return true;
} }
} }
return false; return false;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!