Merge branch 'task#104941754' into staging

This commit is contained in:
Stas 2015-10-22 13:28:25 +03:00
parent 4ddfe934d6
commit 14b93ee3b4

View file

@ -191,7 +191,7 @@ namespace :import do
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),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.country.try(:strip), x.country.try(:strip),
x.id, x.id,
[x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"), [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
@ -322,7 +322,7 @@ namespace :import do
1, 1,
'y', 'y',
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
x.object_registry.try(:crid), x.object_registry.try(:crid),
x.registrant, x.registrant,
@ -334,7 +334,7 @@ namespace :import do
domain_contacts << [ domain_contacts << [
'AdminDomainContact', 'AdminDomainContact',
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
dc.contactid dc.contactid
] ]
@ -345,7 +345,7 @@ namespace :import do
domain_contacts << [ domain_contacts << [
'TechDomainContact', 'TechDomainContact',
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
dc.contactid dc.contactid
] ]
@ -366,7 +366,7 @@ namespace :import do
ips[:ipv4].try(:strip), ips[:ipv4].try(:strip),
ips[:ipv6].try(:strip), ips[:ipv6].try(:strip),
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id x.id
] ]
end if x.nsset && x.nsset.hosts end if x.nsset && x.nsset.hosts
@ -380,7 +380,7 @@ namespace :import do
3, # ds_alg 3, # ds_alg
1, # ds_digest_type /SHA1) 1, # ds_digest_type /SHA1)
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id x.id
] ]
end end