From 0eaebadc3d943189bef136bbc2205897c106c507 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Fri, 7 Mar 2014 00:04:38 -0500
Subject: I changed a view

---
 app/views/matches/show.html.erb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'app/views/matches/show.html.erb')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index e95cd07..b31c989 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -1,6 +1,6 @@
 <p>
   <strong>Tournament:</strong>
-  <%= @match.tournament %>
+  <%= @match.tournament.id %>
 </p>
 
 <p>
@@ -8,5 +8,17 @@
   <%= @match.name %>
 </p>
 
+<% if @tournament.hosts.include?(current_user) %>
+	<%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %>
+		<ul>
+			<% @match.teams.each do |team| %>
+				<li><label><input type="radio" name="winner" value="<%= team.id %>">
+					<%= team.users.collect{|u| u.user_name}.join(", ") %></label></li>
+		  <% end %>
+		</ul>
+		<%= submit_tag("Select winner") %>
+	<% end %>
+<% end %>
+
 <%= link_to 'Edit', edit_tournament_match_path(@tournament, @match) %> |
 <%= link_to 'Back', tournament_matches_path %>
-- 
cgit v1.2.3-2-g168b


From c1f714a479eb7ca9e9125e283361a471dd928278 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Fri, 7 Mar 2014 00:25:38 -0500
Subject: Merge branch 'clean'

Conflicts:
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043624_create_teams.rb
	db/migrate/20140304043626_create_alerts.rb
	db/migrate/20140304043629_create_pms.rb
	db/migrate/20140304043633_create_users.rb
	db/migrate/20140304043637_create_server_settings.rb
	db/migrate/20140304043700_create_tournament_options.rb
	db/migrate/20140307045916_create_servers.rb
	db/migrate/20140307045922_create_matches.rb
	db/migrate/20140307045927_create_teams.rb
	db/migrate/20140307045934_create_alerts.rb
	db/migrate/20140307045941_create_pms.rb
	db/migrate/20140307050001_create_users.rb
	db/migrate/20140307050016_create_server_settings.rb
	db/migrate/20140307050023_create_tournament_options.rb
	db/migrate/20140307051752_create_servers.rb
	db/migrate/20140307051756_create_tournaments.rb
	db/migrate/20140307051800_create_matches.rb
	db/migrate/20140307051804_create_teams.rb
	db/migrate/20140307051808_create_alerts.rb
	db/migrate/20140307051812_create_pms.rb
	db/migrate/20140307051816_create_games.rb
	db/migrate/20140307051820_create_users.rb
	db/migrate/20140307051824_create_game_attributes.rb
	db/migrate/20140307051827_create_server_settings.rb
	db/migrate/20140307051831_create_user_team_pairs.rb
	db/migrate/20140307051835_create_team_match_pairs.rb
	db/migrate/20140307051853_add_index_to_users_email.rb
	db/migrate/20140307051857_add_index_to_users_user_name.rb
	db/migrate/20140307051901_add_password_digest_to_users.rb
	db/migrate/20140307051904_add_remember_token_to_users.rb
	db/migrate/20140307051908_create_tournament_options.rb
	db/schema.rb
	generate.sh
---
 app/views/matches/show.html.erb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/views/matches/show.html.erb')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 0b02ae7..3abb1f7 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -10,5 +10,10 @@
   <%= @match.name %>
 </p>
 
+<p>
+  <strong>Winner:</strong>
+  <%= @match.winner %>
+</p>
+
 <%= link_to 'Edit', edit_match_path(@match) %> |
 <%= link_to 'Back', matches_path %>
-- 
cgit v1.2.3-2-g168b


From 8fc6b48caccdb8fbfe04e41282444e0b916883b3 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Fri, 7 Mar 2014 00:38:47 -0500
Subject: luke

---
 app/views/matches/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/views/matches/show.html.erb')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index d8112b7..f5a3686 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -9,14 +9,14 @@
 </p>
 
 <% if @tournament.hosts.include?(current_user) %>
-	<%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %>
+	<%= form_for(@match, method: "put") do |f| %>
 		<ul>
 			<% @match.teams.each do |team| %>
-				<li><label><input type="radio" name="winner" value="<%= team.id %>">
+				<li><label><%= f.radio_button(:winner, team.id) %>
 					<%= team.users.collect{|u| u.user_name}.join(", ") %></label></li>
 		  <% end %>
 		</ul>
-		<%= submit_tag("Select winner") %>
+		<%= f.submit("Select winner") %>
 	<% end %>
 <% end %>
 
-- 
cgit v1.2.3-2-g168b