Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: compare imported ids as string instead of converting to integer, same as LookupContainer

This commit is contained in:
Neil Lalonde 2017-10-23 13:59:45 -04:00
parent 89a1b34480
commit aec5de451b
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

@ -178,7 +178,7 @@ class ImportScripts::Base
opts[:name] = UserNameSuggester.suggest(import_name)
existing = Group.where(name: opts[:name]).first
return existing if existing && existing.custom_fields["import_id"].to_i == (import_id.to_i)
return existing if existing && existing.custom_fields["import_id"].to_s == (import_id.to_s)
g = existing || Group.new(opts)
g.custom_fields["import_id"] = import_id
g.custom_fields["import_name"] = import_name
@ -270,7 +270,7 @@ class ImportScripts::Base
post_create_action = opts.delete(:post_create_action)
existing = User.joins(:user_emails).where("user_emails.email = ? OR username = ?", opts[:email].downcase, opts[:username]).first
return existing if existing && (merge || existing.custom_fields["import_id"].to_i == import_id.to_i)
return existing if existing && (merge || existing.custom_fields["import_id"].to_s == import_id.to_s)
bio_raw = opts.delete(:bio_raw)
website = opts.delete(:website)