Merge users based on their email in vBulletin importer

This commit is contained in:
Régis Hanol
2018-10-19 15:16:45 +02:00
parent 7166d7de9a
commit 637123ff6f
2 changed files with 10 additions and 22 deletions

View File

@ -146,7 +146,7 @@ EOM
last_user_id = users[-1]["userid"]
before = users.size
users.reject! { |u| @lookup.user_already_imported?(u["userid"].to_i) }
users.reject! { |u| @lookup.user_already_imported?(u["userid"]) }
create_users(users, total: user_count, offset: offset) do |user|
email = user["email"].presence || fake_email
@ -162,6 +162,7 @@ EOM
username: username,
password: password,
email: email,
merge: true,
website: user["homepage"].strip,
title: @htmlentities.decode(user["usertitle"]).strip,
primary_group_id: group_id_from_imported_group_id(user["usergroupid"].to_i),
@ -176,7 +177,6 @@ EOM
end
@usernames = UserCustomField.joins(:user).where(name: 'import_username').pluck('user_custom_fields.value', 'users.username').to_h
end
def create_groups_membership