Stuffed chicken, more tournament

code/MoyaWeb/WebContent/WEB-INF/faces-config.xml

@@ -139,6 +139,24 @@
 			<redirect />
 			<redirect />
 		</navigation-case>
 		</navigation-case>
 	</navigation-rule>
 	</navigation-rule>
+	<navigation-rule>
+		<display-name>tournaments/admin/move-to-creation-screen</display-name>
+		<from-view-id>/tournaments/admin/index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>create</from-outcome>
+			<to-view-id>/tournaments/admin/createwizard.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<display-name>tournaments/admin/tournament-created</display-name>
+		<from-view-id>/tournaments/admin/createwizard.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/tournaments/admin/index.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
 </faces-config>
 </faces-config>
 
 
 
 

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

@@ -110,7 +110,7 @@
 							<br />
 							<br />
 						</p:panel>
 						</p:panel>
 						<div style="float: right;">
 						<div style="float: right;">
-							<p:commandButton icon="apply" value="#{i18n['tournaments.admin.create_tournament']}" actionListener="#{tournamentCreateView.save}"/>
+							<p:commandButton icon="apply" value="#{i18n['tournaments.admin.create_tournament']}" action="#{tournamentCreateView.save}"/>
 						</div>
 						</div>
 					</p:tab>
 					</p:tab>
 				</p:wizard>
 				</p:wizard>

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

@@ -51,8 +51,9 @@
 					<h:outputText value="#{tournament.rules.name}" />
 					<h:outputText value="#{tournament.rules.name}" />
 				</p:column>
 				</p:column>
  			</p:dataTable>
  			</p:dataTable>
-			
-		
+			<h:form>
+				<p:commandButton value="#{i18n['tournament.admin.create']}" action="#{tournamentAdminView.create}"/>
+			</h:form>
 		</ui:define>
 		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>

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

@@ -18,4 +18,8 @@ public class TournamentAdminView {
 		List<Tournament> tl = tournamentBean.getActiveTournaments();
 		List<Tournament> tl = tournamentBean.getActiveTournaments();
 		return tl;
 		return tl;
 	}
 	}
+	
+	public String create() {
+		return "create";
+	}
 }
 }

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

@@ -54,7 +54,7 @@ public class TournamentCreateView extends GenericCDIView {
 		}
 		}
 	}
 	}
 
 
-	public void save(ActionEvent actionEvent) {
+	public String save() {
 		tournament.setPlayersPerTeam(tournament.getPlayersPerMatch() + backupPlayers);
 		tournament.setPlayersPerTeam(tournament.getPlayersPerMatch() + backupPlayers);
 		tournament.setLanEvent(eventBean.getCurrentEvent());
 		tournament.setLanEvent(eventBean.getCurrentEvent());
 		tournament.setTournamentStatus(TournamentStatus.SETUP);
 		tournament.setTournamentStatus(TournamentStatus.SETUP);
@@ -62,6 +62,8 @@ public class TournamentCreateView extends GenericCDIView {
 		tournament.setRules(rules);
 		tournament.setRules(rules);
 		
 		
 		tournamentBean.createTournament(tournament);
 		tournamentBean.createTournament(tournament);
+		
+		return "success";
 	}
 	}
 	
 	
 	public List<TournamentGame> getTournamentGames() {
 	public List<TournamentGame> getTournamentGames() {