From 6d24bf8993292206bdeb724841053650abfbe5ff Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Thu, 25 Apr 2013 16:51:45 -0400 Subject: [PATCH] made some changes to the update profile --- app/controllers/users_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c2c40df..c45d37e 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -22,10 +22,11 @@ class UsersController < ApplicationController end def update - if not (!current_user.email == params[:user][:email] || User.where(:email => params[:user][:email]).exists?) - current_user.update_attributes(params[:user]) - end - redirect_to user_account_settings_path(:user_id => current_user.id) + current_user.update_attributes(params[:user].reject { |k| k == "password" }) + 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) end end