diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 10 | ||||
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 25af8a1..9e539ac 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -13,12 +13,12 @@ class SessionsController < ApplicationController respond_to do |format| if @user && @user.authenticate(params[:session][:password]) sign_in @user - format.html { redirect_to root_path } + format.html { redirect_to root_path } else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end + format.html { render action: 'new' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end end # DELETE /sessions/current diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 27ba020..5c53693 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -15,6 +15,7 @@ class TournamentsController < ApplicationController # GET /tournaments/new def new @game_names = Game.all.collect + @game = params[:game] @tournament = Tournament.new end @@ -22,12 +23,6 @@ class TournamentsController < ApplicationController def edit end - def selected - render :update do |page| - page.replace_html 'ajax-form', :partial => 'selected' - end - end - # POST /tournaments # POST /tournaments.json def create @@ -76,6 +71,6 @@ 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) + params.require(:tournament).permit(:game_id, :game) end end |