Commit 734c9129 by Antti Tonkyra

Tuning, logic fix

1 parent 298fc0db
...@@ -141,7 +141,7 @@ public class TournamentBean implements TournamentBeanLocal { ...@@ -141,7 +141,7 @@ public class TournamentBean implements TournamentBeanLocal {
if(capt != null) { if(capt != null) {
// Assert team has the correct number of players for a match // Assert team has the correct number of players for a match
if(tournamentParticipant.getTeamMembers().size() >= tournamentParticipant.getTournament().getPlayersPerTeam()) { if(tournamentParticipant.getTeamMembers().size() >= tournamentParticipant.getTournament().getPlayersPerMatch()) {
tournamentParticipant = tournamentParticipantFacade.create(tournamentParticipant); tournamentParticipant = tournamentParticipantFacade.create(tournamentParticipant);
t.getParticipants().add(tournamentParticipant); t.getParticipants().add(tournamentParticipant);
} else { } else {
......
...@@ -39,7 +39,7 @@ public class TournamentGame extends GenericEntity implements Serializable { ...@@ -39,7 +39,7 @@ public class TournamentGame extends GenericEntity implements Serializable {
@JoinColumn(name = "event_id", nullable = false) @JoinColumn(name = "event_id", nullable = false)
private LanEvent lanEvent; private LanEvent lanEvent;
@OneToMany @OneToMany(mappedBy="tournamentGame")
private List<TournamentRule> availableRules; private List<TournamentRule> availableRules;
public TournamentGame() { super(); } public TournamentGame() { super(); }
......
...@@ -12,7 +12,7 @@ public enum MapPermission implements IAppPermission { ...@@ -12,7 +12,7 @@ public enum MapPermission implements IAppPermission {
; ;
public static final String S_MANAGE_OTHERS = "MAP/MANAGE_OTHERS"; public static final String S_MANAGE_OTHERS = "MAP/MANAGE_OTHERS";
//public static final String S_BUY_PLACES = "MAP/BUY_PLACES"; public static final String S_BUY_PLACES = "MAP/BUY_PLACES";
public static final String S_VIEW = "MAP/VIEW"; public static final String S_VIEW = "MAP/VIEW";
public static final String S_MANAGE_MAPS = "MAP/MANAGE_MAPS"; public static final String S_MANAGE_MAPS = "MAP/MANAGE_MAPS";
public static final String S_RELEASE_PLACE = "MAP/RELEASE_PLACE"; public static final String S_RELEASE_PLACE = "MAP/RELEASE_PLACE";
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!