From 734729119cbc31e847fd46609b598573f365bdc4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 19:32:28 -0400 Subject: tournaments: unify params[:game] and params[:tournament][:game_id] --- app/controllers/tournaments_controller.rb | 8 ++++++-- app/views/tournaments/_selected.html.erb | 9 ++++----- app/views/tournaments/new.html.erb | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 03dc5b8..3835a59 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -32,7 +32,11 @@ class TournamentsController < ApplicationController # GET /tournaments/new def new @games = Game.all - @tournament = Tournament.new(game: Game.find_by_id(params[:game])) + if params[:tournament] + @tournament = Tournament.new(game: Game.find(params[:tournament][:game_id])) + else + @tournament = Tournament.new() + end end # GET /tournaments/1/edit @@ -146,7 +150,7 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game, :game_id, :status, :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(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) end def is_owner?(object) diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index 4efd17a..9240c49 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -2,18 +2,17 @@ <%= render "common/error_messages", :target => @tournament %> <%= f.hidden_field(:game_id) %> - <% @game = Game.find(params[:game]) %> <% @tournament.attributes.each do |name, value| %> <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") or (name == "set_rounds") %> <% next %> <% end %>

<%= f.label name %>
- <% unless @game.attributes[name].nil? %> + <% unless @tournament.game.attributes[name].nil? %> <% if name == "sampling_method" %> - <%= f.select( name, @game.sampling_method.split(',') ) %> + <%= f.select( name, @tournament.game.sampling_method.split(',') ) %> <% else %> - <%= f.text_field(name, :value => @game.attributes[name] ) %> + <%= f.text_field(name, :value => @tournament.game.attributes[name] ) %> <% end %> <% else %> <%= f.text_field name %> @@ -22,7 +21,7 @@ <% end %> <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %> - <% @game.settings.each do |setting| %> + <% @tournament.game.settings.each do |setting| %>

<%= setting_fields.label setting.name %>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb index 8c74068..66149fe 100644 --- a/app/views/tournaments/new.html.erb +++ b/app/views/tournaments/new.html.erb @@ -1,7 +1,7 @@

New Tournament

<%= form_tag(new_tournament_path, method: "get") do %> - <%= select_tag('game', + <%= select_tag('tournament[game_id]', options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id), :prompt => "Select a Game Type") %> <%= submit_tag("Select", :class => "btn btn-success btn-xs") %> -- cgit v1.2.3-54-g00ecf From d0ff792fa930a322f38338bd4de86712eca6eea9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 19:32:53 -0400 Subject: tournaments_controller: permit game settings through --- app/controllers/tournaments_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 3835a59..b276368 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -150,7 +150,12 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) + permitted = [:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method] + if params[:tournament][:game_id] + game = Game.find(params[:tournament][:game_id]) + permitted.push(:settings => game.settings.collect{|s| s.name}) + end + params.require(:tournament).permit(permitted) end def is_owner?(object) -- cgit v1.2.3-54-g00ecf From c5e0aeb5a055797fe4f26fb9e6f9e163d5d7f718 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 20:21:54 -0400 Subject: Updated remote_usernames --- app/controllers/users_controller.rb | 19 ++++++++++++++++++- app/models/remote_username.rb | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c3261b8..68c0743 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,8 @@ class UsersController < ApplicationController + require 'httparty' + require 'json' + # GET /users # GET /users.json @@ -36,7 +39,7 @@ class UsersController < ApplicationController respond_to do |format| if @user.save sign_in @user - if @user.id == 1 + if @user.id == daft punk1 # This is the first user, so give them all the power @user.permissions = 0xFFFFFFFF @user.save @@ -74,6 +77,20 @@ 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. def set_user diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index e5d0a8c..c2c3d20 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -9,4 +9,4 @@ class RemoteUsername < ActiveRecord::Base def value=(v) self.json_value = v.to_json end -end +end -- cgit v1.2.3-54-g00ecf From a729106e956e051818bb2d37f1581f3bf3abcefd Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 20:32:58 -0400 Subject: Fixed several user controller errors --- app/controllers/users_controller.rb | 2 +- app/views/users/show.html.erb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 68c0743..cfa5d67 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -39,7 +39,7 @@ class UsersController < ApplicationController respond_to do |format| if @user.save sign_in @user - if @user.id == daft punk1 + if @user.id == 1 # This is the first user, so give them all the power @user.permissions = 0xFFFFFFFF @user.save diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b85cbda..81eee6f 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -20,6 +20,14 @@ too single

+

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

+ +

+

Recent Tournaments Played

-- cgit v1.2.3-54-g00ecf