From 0a2f0fb40fc7342351e8bc66f3c67b84b1bb543b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:23:35 -0400 Subject: remove test code --- app/controllers/static_controller.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'app') diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 038cc19..6fc9490 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -1,7 +1,4 @@ class StaticController < ApplicationController def homepage end - - def test - end end -- cgit v1.2.3-2-g168b From dee108fa64e6224a7a86275d9cf99b882362ae27 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:38:27 -0400 Subject: touch all the javascript files to shut up warnings --- app/assets/javascripts/alerts/edit.js.coffee | 0 app/assets/javascripts/alerts/index.js.coffee | 0 app/assets/javascripts/alerts/new.js.coffee | 0 app/assets/javascripts/alerts/show.js.coffee | 0 app/assets/javascripts/application.js | 2 +- app/assets/javascripts/application/.keep | 0 app/assets/javascripts/brackets/edit.js.coffee | 0 app/assets/javascripts/brackets/index.js.coffee | 0 app/assets/javascripts/brackets/new.js.coffee | 0 app/assets/javascripts/brackets/show.js.coffee | 0 app/assets/javascripts/common/.keep | 0 app/assets/javascripts/games/edit.js.coffee | 0 app/assets/javascripts/games/index.js.coffee | 0 app/assets/javascripts/games/new.js.coffee | 0 app/assets/javascripts/games/show.js.coffee | 0 app/assets/javascripts/matches/show.js.coffee | 2 ++ app/assets/javascripts/matches_show.js.coffee | 2 -- app/assets/javascripts/pms/edit.js.coffee | 0 app/assets/javascripts/pms/index.js.coffee | 0 app/assets/javascripts/pms/new.js.coffee | 0 app/assets/javascripts/pms/show.js.coffee | 0 app/assets/javascripts/search/go.js.coffee | 0 app/assets/javascripts/server/edit.js.coffee | 0 app/assets/javascripts/server/show.js.coffee | 0 app/assets/javascripts/sessions/new.js.coffee | 0 app/assets/javascripts/static/homepage.js.coffee | 0 app/assets/javascripts/teams/edit.js.coffee | 0 app/assets/javascripts/teams/index.js.coffee | 0 app/assets/javascripts/teams/new.js.coffee | 0 app/assets/javascripts/teams/show.js.coffee | 0 app/assets/javascripts/tournaments/edit.js.coffee | 0 app/assets/javascripts/tournaments/index.js.coffee | 0 app/assets/javascripts/tournaments/new.js.coffee | 0 app/assets/javascripts/tournaments/show.js.coffee | 30 ++++++++++++++++++++++ app/assets/javascripts/tournaments_show.js.coffee | 30 ---------------------- app/assets/javascripts/users/edit.js.coffee | 0 app/assets/javascripts/users/index.js.coffee | 0 app/assets/javascripts/users/new.js.coffee | 0 app/assets/javascripts/users/show.js.coffee | 0 app/views/layouts/application.html.erb | 2 +- 40 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 app/assets/javascripts/alerts/edit.js.coffee create mode 100644 app/assets/javascripts/alerts/index.js.coffee create mode 100644 app/assets/javascripts/alerts/new.js.coffee create mode 100644 app/assets/javascripts/alerts/show.js.coffee create mode 100644 app/assets/javascripts/application/.keep create mode 100644 app/assets/javascripts/brackets/edit.js.coffee create mode 100644 app/assets/javascripts/brackets/index.js.coffee create mode 100644 app/assets/javascripts/brackets/new.js.coffee create mode 100644 app/assets/javascripts/brackets/show.js.coffee delete mode 100644 app/assets/javascripts/common/.keep create mode 100644 app/assets/javascripts/games/edit.js.coffee create mode 100644 app/assets/javascripts/games/index.js.coffee create mode 100644 app/assets/javascripts/games/new.js.coffee create mode 100644 app/assets/javascripts/games/show.js.coffee create mode 100644 app/assets/javascripts/matches/show.js.coffee delete mode 100644 app/assets/javascripts/matches_show.js.coffee create mode 100644 app/assets/javascripts/pms/edit.js.coffee create mode 100644 app/assets/javascripts/pms/index.js.coffee create mode 100644 app/assets/javascripts/pms/new.js.coffee create mode 100644 app/assets/javascripts/pms/show.js.coffee create mode 100644 app/assets/javascripts/search/go.js.coffee create mode 100644 app/assets/javascripts/server/edit.js.coffee create mode 100644 app/assets/javascripts/server/show.js.coffee create mode 100644 app/assets/javascripts/sessions/new.js.coffee create mode 100644 app/assets/javascripts/static/homepage.js.coffee create mode 100644 app/assets/javascripts/teams/edit.js.coffee create mode 100644 app/assets/javascripts/teams/index.js.coffee create mode 100644 app/assets/javascripts/teams/new.js.coffee create mode 100644 app/assets/javascripts/teams/show.js.coffee create mode 100644 app/assets/javascripts/tournaments/edit.js.coffee create mode 100644 app/assets/javascripts/tournaments/index.js.coffee create mode 100644 app/assets/javascripts/tournaments/new.js.coffee create mode 100644 app/assets/javascripts/tournaments/show.js.coffee delete mode 100644 app/assets/javascripts/tournaments_show.js.coffee create mode 100644 app/assets/javascripts/users/edit.js.coffee create mode 100644 app/assets/javascripts/users/index.js.coffee create mode 100644 app/assets/javascripts/users/new.js.coffee create mode 100644 app/assets/javascripts/users/show.js.coffee (limited to 'app') diff --git a/app/assets/javascripts/alerts/edit.js.coffee b/app/assets/javascripts/alerts/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/alerts/index.js.coffee b/app/assets/javascripts/alerts/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/alerts/new.js.coffee b/app/assets/javascripts/alerts/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/alerts/show.js.coffee b/app/assets/javascripts/alerts/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e9430a3..1130838 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,4 +17,4 @@ //= require 'dragsort.js' //= require 'coordinates.js' // -//= require_tree ./common +//= require_tree ./application diff --git a/app/assets/javascripts/application/.keep b/app/assets/javascripts/application/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/brackets/edit.js.coffee b/app/assets/javascripts/brackets/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/brackets/index.js.coffee b/app/assets/javascripts/brackets/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/brackets/new.js.coffee b/app/assets/javascripts/brackets/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/brackets/show.js.coffee b/app/assets/javascripts/brackets/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/common/.keep b/app/assets/javascripts/common/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/javascripts/games/edit.js.coffee b/app/assets/javascripts/games/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/games/index.js.coffee b/app/assets/javascripts/games/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/games/new.js.coffee b/app/assets/javascripts/games/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/games/show.js.coffee b/app/assets/javascripts/games/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/matches/show.js.coffee b/app/assets/javascripts/matches/show.js.coffee new file mode 100644 index 0000000..2609a69 --- /dev/null +++ b/app/assets/javascripts/matches/show.js.coffee @@ -0,0 +1,2 @@ +window.onload = -> + BetterDragSort.makeListSortable(document.getElementById("boxes")); diff --git a/app/assets/javascripts/matches_show.js.coffee b/app/assets/javascripts/matches_show.js.coffee deleted file mode 100644 index 2609a69..0000000 --- a/app/assets/javascripts/matches_show.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -window.onload = -> - BetterDragSort.makeListSortable(document.getElementById("boxes")); diff --git a/app/assets/javascripts/pms/edit.js.coffee b/app/assets/javascripts/pms/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/pms/index.js.coffee b/app/assets/javascripts/pms/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/pms/new.js.coffee b/app/assets/javascripts/pms/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/pms/show.js.coffee b/app/assets/javascripts/pms/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/search/go.js.coffee b/app/assets/javascripts/search/go.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/server/edit.js.coffee b/app/assets/javascripts/server/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/server/show.js.coffee b/app/assets/javascripts/server/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/sessions/new.js.coffee b/app/assets/javascripts/sessions/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/static/homepage.js.coffee b/app/assets/javascripts/static/homepage.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/teams/edit.js.coffee b/app/assets/javascripts/teams/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/teams/index.js.coffee b/app/assets/javascripts/teams/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/teams/new.js.coffee b/app/assets/javascripts/teams/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/teams/show.js.coffee b/app/assets/javascripts/teams/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/tournaments/edit.js.coffee b/app/assets/javascripts/tournaments/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/tournaments/index.js.coffee b/app/assets/javascripts/tournaments/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/tournaments/new.js.coffee b/app/assets/javascripts/tournaments/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/tournaments/show.js.coffee b/app/assets/javascripts/tournaments/show.js.coffee new file mode 100644 index 0000000..1e91d3a --- /dev/null +++ b/app/assets/javascripts/tournaments/show.js.coffee @@ -0,0 +1,30 @@ +Update = (tournament) -> + here = tournament["players"].length + needed = (tournament["min_teams_per_match"] * tournament["min_players_per_team"]) + pct_complete = here / needed + + $("#prog-bar").width (pct_complete * 100) + "%" + $("#players-needed").text here + " " + ((if here is 1 then "player has" else "players have")) + " signed up. " + needed + " players needed. " + + # Update the user list + players = "" + for player in tournament["players"] + players = players + "
  • " + player["user_name"] + "
    • " + $("#tournament-users").html players + + # Enable/disable the "start" button depending on the number of players + $("input[value=\"Start Tournament\"]").prop "disabled", (if (pct_complete >= 1) then false else true) + + # Switch views if the tournament has been started + if tournament["status"] is 1 + window.location.reload true + + # Do it all again + setTimeout (-> + $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update + return + ), 2000 + +# Now kick off the whole process +window.onload = -> + $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update diff --git a/app/assets/javascripts/tournaments_show.js.coffee b/app/assets/javascripts/tournaments_show.js.coffee deleted file mode 100644 index 1e91d3a..0000000 --- a/app/assets/javascripts/tournaments_show.js.coffee +++ /dev/null @@ -1,30 +0,0 @@ -Update = (tournament) -> - here = tournament["players"].length - needed = (tournament["min_teams_per_match"] * tournament["min_players_per_team"]) - pct_complete = here / needed - - $("#prog-bar").width (pct_complete * 100) + "%" - $("#players-needed").text here + " " + ((if here is 1 then "player has" else "players have")) + " signed up. " + needed + " players needed. " - - # Update the user list - players = "" - for player in tournament["players"] - players = players + "
  • " + player["user_name"] + "
    • " - $("#tournament-users").html players - - # Enable/disable the "start" button depending on the number of players - $("input[value=\"Start Tournament\"]").prop "disabled", (if (pct_complete >= 1) then false else true) - - # Switch views if the tournament has been started - if tournament["status"] is 1 - window.location.reload true - - # Do it all again - setTimeout (-> - $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update - return - ), 2000 - -# Now kick off the whole process -window.onload = -> - $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update diff --git a/app/assets/javascripts/users/edit.js.coffee b/app/assets/javascripts/users/edit.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/users/index.js.coffee b/app/assets/javascripts/users/index.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/users/new.js.coffee b/app/assets/javascripts/users/new.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/users/show.js.coffee b/app/assets/javascripts/users/show.js.coffee new file mode 100644 index 0000000..e69de29 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d318129..6cdb54d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,7 +5,7 @@ <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> <%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %> - <%= javascript_include_tag "#{params[:controller]}_#{params[:action]}", "data-turbolinks-track" => true %> + <%= javascript_include_tag "#{params[:controller]}/#{params[:action]}", "data-turbolinks-track" => true %> <%= csrf_meta_tags %> <%= yield :head %> -- cgit v1.2.3-2-g168b From 8d99b715f7027848e76556de75ad22fa14ff522a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:38:44 -0400 Subject: simplify a line in tournaments_controller --- app/controllers/tournaments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index b276368..0390051 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -33,7 +33,7 @@ class TournamentsController < ApplicationController def new @games = Game.all if params[:tournament] - @tournament = Tournament.new(game: Game.find(params[:tournament][:game_id])) + @tournament = Tournament.new(tournament_params) else @tournament = Tournament.new() end -- cgit v1.2.3-2-g168b From 66f225b6aef0946a79abee5e67f74afbf8ea9d1e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:46:06 -0400 Subject: fix json url --- app/assets/javascripts/tournaments/show.js.coffee | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/tournaments/show.js.coffee b/app/assets/javascripts/tournaments/show.js.coffee index 1e91d3a..ef6bb82 100644 --- a/app/assets/javascripts/tournaments/show.js.coffee +++ b/app/assets/javascripts/tournaments/show.js.coffee @@ -1,4 +1,6 @@ -Update = (tournament) -> +json_url = window.location.href.replace(/\.[^/]*$/,'')+".json" + +update = (tournament) -> here = tournament["players"].length needed = (tournament["min_teams_per_match"] * tournament["min_players_per_team"]) pct_complete = here / needed @@ -21,10 +23,10 @@ Update = (tournament) -> # Do it all again setTimeout (-> - $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update + $.ajax(url: json_url).done update return ), 2000 # Now kick off the whole process window.onload = -> - $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update + $.ajax(url: json_url).done update -- cgit v1.2.3-2-g168b From 933199499f9adfa0347783c538a10b88ffb1b98b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:56:43 -0400 Subject: run ./generate.sh --- app/assets/javascripts/static.js.coffee | 3 --- app/assets/stylesheets/static.css.scss | 3 --- app/controllers/static_controller.rb | 2 -- app/helpers/static_helper.rb | 2 -- 4 files changed, 10 deletions(-) delete mode 100644 app/assets/javascripts/static.js.coffee delete mode 100644 app/assets/stylesheets/static.css.scss delete mode 100644 app/controllers/static_controller.rb delete mode 100644 app/helpers/static_helper.rb (limited to 'app') diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/static.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss deleted file mode 100644 index 5a803c8..0000000 --- a/app/assets/stylesheets/static.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the static controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb deleted file mode 100644 index c6df11e..0000000 --- a/app/controllers/static_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class StaticController < ApplicationController -end diff --git a/app/helpers/static_helper.rb b/app/helpers/static_helper.rb deleted file mode 100644 index 8cfc9af..0000000 --- a/app/helpers/static_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module StaticHelper -end -- cgit v1.2.3-2-g168b From d90e7d47ed0900f2f8df62dba2e463752e0e3e81 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 23 Apr 2014 21:25:37 -0400 Subject: save before setting settings --- app/models/tournament.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/models/tournament.rb b/app/models/tournament.rb index e21ccb1..686e066 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -40,6 +40,7 @@ class Tournament < ActiveRecord::Base end def []=(setting_name, val) + @tournament.save tournament_setting = @tournament.settings_raw.find_by_name(setting_name) if tournament_setting.nil? game_setting = @tournament.game.settings.find_by_name(setting_name) -- cgit v1.2.3-2-g168b From d1dbfb1dcd4810f538826fa5e448bdda0998b38e Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:33:49 -0400 Subject: run ./generate.sh --- app/models/game_setting.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index bff8d97..e6d43e5 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,3 +1,4 @@ class GameSetting < ActiveRecord::Base belongs_to :game + belongs_to :parent end -- cgit v1.2.3-2-g168b From cfa41fcc58acc9ae50b84eb51e3d9fa9ecb3b79e Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:45:40 -0400 Subject: run ./generate.sh --- app/controllers/games_controller.rb | 2 +- app/models/game.rb | 1 + app/models/game_setting.rb | 1 - app/views/games/_form.html.erb | 4 ++++ app/views/games/index.html.erb | 2 ++ app/views/games/index.json.jbuilder | 2 +- app/views/games/show.html.erb | 5 +++++ app/views/games/show.json.jbuilder | 2 +- 8 files changed, 15 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index db610bc..8546efb 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -69,6 +69,6 @@ class GamesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def game_params - params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) + params.require(:game).permit(:parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) end end diff --git a/app/models/game.rb b/app/models/game.rb index a181c26..13520ac 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,2 +1,3 @@ class Game < ActiveRecord::Base + belongs_to :parent end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index e6d43e5..bff8d97 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,4 +1,3 @@ class GameSetting < ActiveRecord::Base belongs_to :game - belongs_to :parent end diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index ef250ad..20cb214 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -11,6 +11,10 @@ <% end %> +
    + <%= f.label :parent_id %>
    + <%= f.text_field :parent_id %> +
    <%= f.label :name %>
    <%= f.text_field :name %> diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 6cc7f58..b4c3950 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -3,6 +3,7 @@ + @@ -20,6 +21,7 @@ <% @games.each do |game| %> + diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder index cc0afc9..6b20f60 100644 --- a/app/views/games/index.json.jbuilder +++ b/app/views/games/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@games) do |game| - json.extract! game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method + json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method json.url game_url(game, format: :json) end diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb index 93bfb60..38c8ccb 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -1,5 +1,10 @@

    <%= notice %>

    +

    + Parent: + <%= @game.parent %> +

    +

    Name: <%= @game.name %> diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 60d0a4a..087a156 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at +json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at -- cgit v1.2.3-2-g168b From 47be7c86ca5193ffe4331fbb9358a9171abe748b Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 22:28:27 -0400 Subject: Luke made the remote_username stuff work --- app/controllers/users_controller.rb | 32 ++++++++++++++++++-------------- app/models/remote_username.rb | 6 +++++- app/models/user.rb | 10 +++++++--- app/views/users/show.html.erb | 11 ++++++----- 4 files changed, 36 insertions(+), 23 deletions(-) (limited to 'app') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cfa5d67..4c36148 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -56,8 +56,25 @@ class UsersController < ApplicationController # PATCH/PUT /users/1 # PATCH/PUT /users/1.json def update + ok = true + if params[:user][:remote_usernames].nil? + ok &= @user.update(user_params) + else + params[:user][:remote_usernames].each do |game_name,user_name| + game = Game.find_by_name(game_name) + remote_username = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{user_name}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") + + remote = @user.remote_usernames.where(:game => game).first + if remote.nil? + ok &= @user.remote_usernames.create(game: game, value: remote_username) + else + remote.value = remote_username + ok &= remote.save + end + end + end respond_to do |format| - if @user.update(user_params) + if ok format.html { redirect_to @user, notice: 'User was successfully updated.' } format.json { head :no_content } else @@ -77,19 +94,6 @@ class UsersController < ApplicationController end end - def set_remote - game = Game.find_by_name("League of Legends") - - remote_username = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{@name.downcase}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - remote = @user.find_remote_username(game) - if remote.nil? - @user.remote_username.create(game: game, value: remote_username) - else - remote.value = remote_username - remote.save - end - end private # Use callbacks to share common setup or constraints between actions. diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index c2c3d20..8c1ce26 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -3,7 +3,11 @@ class RemoteUsername < ActiveRecord::Base belongs_to :user def value - JSON.parse(self.json_value) + begin + return JSON.parse(self.json_value) + rescue + return {} + end end def value=(v) diff --git a/app/models/user.rb b/app/models/user.rb index 138f73e..5c0b5b1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -24,9 +24,13 @@ class User < ActiveRecord::Base end def find_remote_username(game) - obj = remote_username.where(:game => game) - if obj.nil? and not game.parent.nil? - return find_remote_username(game.parent) + obj = self.remote_usernames.where(:game => game).first + if obj.nil? + if game.parent.nil? + return nil + else + return find_remote_username(game.parent) + end else return obj.value end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 81eee6f..dfebf08 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -21,11 +21,12 @@

    - <%= label :username %>
    - <%= text_field %> - -

    - + <%= form_for @user do |f| %> + + <%= f.submit "Add Username", :class => 'signup' %> + <% end %>

    -- cgit v1.2.3-2-g168b
    Parent Name Min players per team Max players per team
    <%= game.parent %> <%= game.name %> <%= game.min_players_per_team %> <%= game.max_players_per_team %>