assigned a user id, does not "appear" to have screwed anything up

This commit is contained in:
Ken Johnson
2013-05-24 15:25:06 -04:00
parent 383835d57d
commit 0d841124f5
13 changed files with 31 additions and 17 deletions
+3 -2
View File
@@ -9,7 +9,7 @@ class UsersController < ApplicationController
def create
user = User.new(params[:user])
if user.save
session[:id] = user.id
session[:user_id] = user.user_id
redirect_to home_dashboard_index_path
else
@user = user
@@ -22,11 +22,12 @@ class UsersController < ApplicationController
end
def update
current_user.skip_user_id_assign = true
current_user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") })
pass = params[:user][:password]
current_user.password = pass if !(pass.blank?)
current_user.save!
redirect_to user_account_settings_path(:user_id => current_user.id)
redirect_to user_account_settings_path(:user_id => current_user.user_id)
end
end