Merge branch 'tournament-brainfart' into 'master'

Tournament brainfart

brainfart in variable assignation

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java

@@ -192,7 +192,7 @@ public class TournamentBean implements TournamentBeanLocal {
 		for (TournamentParticipant tp : tournament.getParticipants()) {
 		for (TournamentParticipant tp : tournament.getParticipants()) {
 			for (TournamentTeamMember tm : tp.getTeamMembers()) {
 			for (TournamentTeamMember tm : tp.getTeamMembers()) {
 				EventUser eu = tm.getEventUser();
 				EventUser eu = tm.getEventUser();
-				System.out.println(eu.getNick());
+
 				if (eu.equals(currentUser)) {
 				if (eu.equals(currentUser)) {
 					return true;
 					return true;
 				}
 				}

code/MoyaWeb/WebContent/tournaments/admin/createwizard.xhtml

@@ -19,7 +19,7 @@
 							<h:messages errorClass="error" />
 							<h:messages errorClass="error" />
 							<h:panelGroup rendered="#{tournamentCreateView.tournamentGames.isEmpty() eq false}">
 							<h:panelGroup rendered="#{tournamentCreateView.tournamentGames.isEmpty() eq false}">
 								<h2>#{i18n['tournaments.admin.select_a_game']}</h2>
 								<h2>#{i18n['tournaments.admin.select_a_game']}</h2>
-								<h:selectOneMenu value="#{userGameIDView.gameToAddIdTo}" converter="#{tournamentGameConverter}">
+								<h:selectOneMenu value="#{tournamentCreateView.game}" converter="#{tournamentGameConverter}">
 									<f:selectItems var="game" itemLabel="#{game.name}" value="#{tournamentCreateView.tournamentGames}" itemValue="#{game}" />
 									<f:selectItems var="game" itemLabel="#{game.name}" value="#{tournamentCreateView.tournamentGames}" itemValue="#{game}" />
 								</h:selectOneMenu>
 								</h:selectOneMenu>
 							</h:panelGroup>
 							</h:panelGroup>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentCreateView.java

@@ -104,7 +104,6 @@ public class TournamentCreateView extends GenericCDIView {
 			}
 			}
 
 
 			tournamentRules = tournamentBean.getRulesByGame(game);
 			tournamentRules = tournamentBean.getRulesByGame(game);
-			System.out.println(tournamentRules);
 			break;
 			break;
 		case "selectRuleset":
 		case "selectRuleset":
 			if (rulesetName != null && rulesetName.length() > 0) {
 			if (rulesetName != null && rulesetName.length() > 0) {