Fixed the inability to update profile when not changing name.

This commit is contained in:
Logan Fick
2017-10-28 13:49:36 -04:00
parent 577961d122
commit b1f739f6f8

View File

@@ -141,7 +141,7 @@ class UsersController < ApplicationController
else else
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark]) userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
end end
if User.find_by(name: userdata[:name]) if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != current_user
flash[:alert] = "You have entered a name that belongs to someone else. Please try another." flash[:alert] = "You have entered a name that belongs to someone else. Please try another."
redirect_to edit_user_path(@user) redirect_to edit_user_path(@user)
return return