From aec5de451b85e0d83ea3f8d4793c8d60c6552cd0 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 23 Oct 2017 13:59:45 -0400 Subject: [PATCH] FIX: compare imported ids as string instead of converting to integer, same as LookupContainer --- script/import_scripts/base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index e94506e496..f06d8cbe87 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -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)