From e6b2993ad072d0cad2e52997c7957aae0a03415c Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 20:06:40 -0500 Subject: I changed the user controller --- app/controllers/sessions_controller.rb | 8 ++------ app/controllers/users_controller.rb | 9 ++++++++- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 8a9de56..722b8c2 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -7,19 +7,15 @@ class SessionsController < ApplicationController user = User.find_by(email: params[:session][:email].downcase) if user && user.authenticate(params[:session][:password]) sign_in user - #redirect goes here + redirect_to root_path else render 'new' end end def destroy - sign_out - - #I dont know where to redirect to so yeah - # redirect_to sign_in - + redirect_to root_path end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 74ab72c..2abc93e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,13 +1,14 @@ class UsersController < ApplicationController def new + @user = User.new end def create @user = User.new(user_params) if @user.save sign_in @user - #redirect_to @user + #redirect_to root_path else render 'new' end @@ -16,4 +17,10 @@ class UsersController < ApplicationController def show @user = User.find(param[:id]) end + + private + + def user_params + params.require(:user).permit(:name, :email, :user_name, :password, :password_confirmation) + end end -- cgit v1.2.3-2-g168b From fc052b7743aa3d5bebe9f6c4216c7515a2174aa7 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 21:33:55 -0500 Subject: Users work 1000000000000% but there is a path issue with the html --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2abc93e..6436e4e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -8,7 +8,7 @@ class UsersController < ApplicationController @user = User.new(user_params) if @user.save sign_in @user - #redirect_to root_path + redirect_to root_path else render 'new' end -- cgit v1.2.3-2-g168b From 39e0c9ca280d16817eb8d7683d80788f2544ae5f Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Mon, 3 Mar 2014 14:01:55 -0500 Subject: More documentation changes --- app/controllers/sessions_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers') diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 722b8c2..68cb949 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,6 +3,7 @@ class SessionsController < ApplicationController def new end + # find the user and create a new session def create user = User.find_by(email: params[:session][:email].downcase) if user && user.authenticate(params[:session][:password]) -- cgit v1.2.3-2-g168b From 7a8f0a0c74c96fcde2a38fbf98123b6c8d44308c Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 3 Mar 2014 15:03:26 -0500 Subject: Added some partial rendering. --- app/controllers/tournaments_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 56233b6..27ba020 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -22,6 +22,12 @@ 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 -- cgit v1.2.3-2-g168b