codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4025 from gschlager/importer-name

Browse source 
Allow importers to set empty names
This commit is contained in:
Régis Hanol 2016-02-21 23:52:15 +01:00
commit 87e72cb521
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/import_scripts/base.rb
View file

@ -278,7 +278,6 @@ class ImportScripts::Base
avatar_url = opts.delete(:avatar_url)
# Allow the || operations to work with empty strings ''
opts[:name] = nil if opts[:name].blank?
opts[:username] = nil if opts[:username].blank?
opts[:name] = User.suggest_name(opts[:email]) unless opts[:name]
@ -287,7 +286,8 @@ class ImportScripts::Base
opts[:username].length > User.username_length.end ||
!User.username_available?(opts[:username]) ||
!UsernameValidator.new(opts[:username]).valid_format?
opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name] || opts[:email])
opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name].presence || opts[:email])
end
opts[:email] = opts[:email].downcase
opts[:trust_level] = TrustLevel[1] unless opts[:trust_level]