Merge branch '105046446-org_and_name_import' into staging

This commit is contained in:
Stas 2015-10-28 12:36:07 +02:00
commit 93a1633f52

View file

@ -189,7 +189,7 @@ namespace :import do
x.ssn.try(:strip), x.ssn.try(:strip),
ident_type_map[x.ssntype], ident_type_map[x.ssntype],
x.object.authinfopw.try(:strip), x.object.authinfopw.try(:strip),
name, x.organization.try(:strip)? x.organization.try(:strip): name,
x.organization.try(:strip), 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),