diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-03 18:03:33 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-03 18:03:33 -0400 |
commit | 36e6db5e8fbcbeeddb6a68d702bb8a2bdc3a514a (patch) | |
tree | 2cf6a72fce43f4644dc16177a4d42fb778fb8c97 /app/controllers/users_controller.rb | |
parent | effe4608e808a385bb912fccac26381d0bd0c95a (diff) | |
parent | 91623c4f865d25c33ed64632ae61b506e0bb1ab4 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 60857f1..5de344c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,6 +4,7 @@ class UsersController < ApplicationController before_action :perms_create, only: [:new, :create] # GET /users + # GET /users.json def index @users = User.all @@ -26,15 +27,17 @@ class UsersController < ApplicationController # POST /users # POST /users.json def create - @user = User.new(user_params) - respond_to do |format| - if @user.save - sign_in @user - format.html { redirect_to root_path, notice: 'User was successfully created.' } - format.json { render action: 'show', status: :created, location: @user } - else - format.html { render action: 'new', status: :unprocessable_entity } - format.json { render json: @user.errors, status: :unprocessable_entity } + if simple_captcha_valid? + @user = User.new(user_params) + respond_to do |format| + if @user.save + sign_in @user + format.html { redirect_to root_path, notice: 'User was successfully created.' } + format.json { render action: 'show', status: :created, location: @user } + else + format.html { render action: 'new', status: :unprocessable_entity } + format.json { render json: @user.errors, status: :unprocessable_entity } + end end end end |