diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/matches_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/remote_usernames_controller.rb | 74 | ||||
-rw-r--r-- | app/controllers/sessions_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/users_controller.rb | 1 |
4 files changed, 76 insertions, 4 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 8d65960..ba6ab16 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -14,7 +14,6 @@ class MatchesController < ApplicationController # GET /matches/new def new - end # GET /matches/1/edit @@ -54,10 +53,10 @@ class MatchesController < ApplicationController # DELETE /matches/1 # DELETE /matches/1.json def destroy - @match.destroy respond_to do |format| format.html { redirect_to tournament_matches_path } + format.json { head :no_content } end end @@ -70,6 +69,7 @@ class MatchesController < ApplicationController def set_tournament @tournament = Tournament.find(params[:tournament_id]) end + # Never trust parameters from the scary internet, only allow the white list through. def match_params params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) diff --git a/app/controllers/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb new file mode 100644 index 0000000..8676c00 --- /dev/null +++ b/app/controllers/remote_usernames_controller.rb @@ -0,0 +1,74 @@ +class RemoteUsernamesController < ApplicationController + before_action :set_remote_username, only: [:show, :edit, :update, :destroy] + + # GET /remote_usernames + # GET /remote_usernames.json + def index + @remote_usernames = RemoteUsername.all + end + + # GET /remote_usernames/1 + # GET /remote_usernames/1.json + def show + end + + # GET /remote_usernames/new + def new + @remote_username = RemoteUsername.new + end + + # GET /remote_usernames/1/edit + def edit + end + + # POST /remote_usernames + # POST /remote_usernames.json + def create + @remote_username = RemoteUsername.new(remote_username_params) + + respond_to do |format| + if @remote_username.save + format.html { redirect_to @remote_username, notice: 'Remote username was successfully created.' } + format.json { render action: 'show', status: :created, location: @remote_username } + else + format.html { render action: 'new' } + format.json { render json: @remote_username.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /remote_usernames/1 + # PATCH/PUT /remote_usernames/1.json + def update + respond_to do |format| + if @remote_username.update(remote_username_params) + format.html { redirect_to @remote_username, notice: 'Remote username was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @remote_username.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /remote_usernames/1 + # DELETE /remote_usernames/1.json + def destroy + @remote_username.destroy + respond_to do |format| + format.html { redirect_to remote_usernames_url } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_remote_username + @remote_username = RemoteUsername.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def remote_username_params + params.require(:remote_username).permit(:game_id, :user_id, :user_name) + end +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index aaaccd7..1bae258 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -39,7 +39,6 @@ class SessionsController < ApplicationController end private - # Use callbacks to share common setup or constraints between actions. def set_session #@session = Session.find(cookies[:remember_token]) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 26c5d49..8a8b994 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -12,7 +12,6 @@ class UsersController < ApplicationController # GET /users/1 # GET /users/1.json def show - @user = User.find(params[:id]) end # GET /users/new |