Merge branch '105046446-org_and_name_import' into staging

This commit is contained in:
Stas 2015-10-28 12:39:59 +02:00
parent 93a1633f52
commit fde9b4431e

View file

@ -153,7 +153,6 @@ namespace :import do
ident_type ident_type
auth_info auth_info
name name
org_name
registrar_id registrar_id
creator_str creator_str
updator_str updator_str
@ -190,7 +189,6 @@ namespace :import do
ident_type_map[x.ssntype], ident_type_map[x.ssntype],
x.object.authinfopw.try(:strip), x.object.authinfopw.try(:strip),
x.organization.try(:strip)? x.organization.try(:strip): name, x.organization.try(:strip)? x.organization.try(:strip): name,
x.organization.try(:strip),
Registrar.find_by(legacy_id: x.object.try(:clid)).try(:id), Registrar.find_by(legacy_id: x.object.try(:clid)).try(:id),
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),