removes user_id column from User model to use idiomatic Rails automatic IDs
This commit is contained in:
@@ -10,7 +10,7 @@ class UsersController < ApplicationController
|
||||
def create
|
||||
user = User.new(user_params)
|
||||
if user.save
|
||||
session[:user_id] = user.user_id
|
||||
session[:user_id] = user.id
|
||||
redirect_to home_dashboard_index_path
|
||||
else
|
||||
@user = user
|
||||
@@ -26,22 +26,21 @@ class UsersController < ApplicationController
|
||||
def update
|
||||
message = false
|
||||
|
||||
user = User.where("user_id = '#{params[:user][:user_id]}'")[0]
|
||||
user = User.where("id = '#{params[:user][:id]}'")[0]
|
||||
|
||||
if user
|
||||
user.skip_user_id_assign = true
|
||||
user.update_attributes(user_params_without_password)
|
||||
if params[:user][:password].present? && (params[:user][:password] == params[:user][:password_confirmation])
|
||||
user.password = params[:user][:password]
|
||||
end
|
||||
message = true if user.save!
|
||||
respond_to do |format|
|
||||
format.html { redirect_to user_account_settings_path(user_id: current_user.user_id) }
|
||||
format.json { render json: {msg: message ? "success" : "false "} }
|
||||
format.html { redirect_to user_account_settings_path(user_id: current_user.id) }
|
||||
format.json { render :json => {:msg => message ? "success" : "false "} }
|
||||
end
|
||||
else
|
||||
flash[:error] = "Could not update user!"
|
||||
redirect_to user_account_settings_path(user_id: current_user.user_id)
|
||||
redirect_to user_account_settings_path(user_id: current_user.id)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user