IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Permit changing my own username's case without an error saying it is already taken

Browse Source
This commit is contained in:
Neil Lalonde
2013-06-28 16:21:46 -04:00
parent b37b6ce664
commit a352b70bfc
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@@ -159,9 +159,10 @@ class User < ActiveRecord::Base
end
def change_username(new_username)
current_username, self.username = username, new_username
current_username = self.username
self.username = new_username
if SiteSetting.call_discourse_hub? && valid?
if current_username.downcase != new_username.downcase && SiteSetting.call_discourse_hub? && valid?
begin
DiscourseHub.change_nickname(current_username, new_username)
rescue DiscourseHub::NicknameUnavailable
@@ -566,7 +567,8 @@ class User < ActiveRecord::Base
def username_validator
username_format_validator || begin
lower = username.downcase
if username_changed? && User.where(username_lower: lower).exists?
existing = User.where(username_lower: lower).first
if username_changed? && existing && existing.id != self.id
errors.add(:username, I18n.t(:'user.username.unique'))
end
end