diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/controllers/tournaments_controller.rb | |
parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/controllers/tournaments_controller.rb')
-rw-r--r-- | app/controllers/tournaments_controller.rb | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb deleted file mode 100644 index 720305f..0000000 --- a/app/controllers/tournaments_controller.rb +++ /dev/null @@ -1,74 +0,0 @@ -class TournamentsController < ApplicationController - before_action :set_tournament, only: [:show, :edit, :update, :destroy] - - # GET /tournaments - # GET /tournaments.json - def index - @tournaments = Tournament.all - end - - # GET /tournaments/1 - # GET /tournaments/1.json - def show - end - - # GET /tournaments/new - def new - @tournament = Tournament.new - end - - # GET /tournaments/1/edit - def edit - end - - # POST /tournaments - # POST /tournaments.json - def create - @tournament = Tournament.new(tournament_params) - - respond_to do |format| - if @tournament.save - format.html { redirect_to @tournament, notice: 'Tournament was successfully created.' } - format.json { render action: 'show', status: :created, location: @tournament } - else - format.html { render action: 'new' } - format.json { render json: @tournament.errors, status: :unprocessable_entity } - end - end - end - - # PATCH/PUT /tournaments/1 - # PATCH/PUT /tournaments/1.json - def update - respond_to do |format| - if @tournament.update(tournament_params) - format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @tournament.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /tournaments/1 - # DELETE /tournaments/1.json - def destroy - @tournament.destroy - respond_to do |format| - format.html { redirect_to tournaments_url } - format.json { head :no_content } - end - end - - private - # Use callbacks to share common setup or constraints between actions. - def set_tournament - @tournament = Tournament.find(params[:id]) - end - - # Never trust parameters from the scary internet, only allow the white list through. - def tournament_params - params.require(:tournament).permit(:game_id) - end -end |