zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-21 02:05:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104941314-object_creator_fix' into staging

Browse source
This commit is contained in:
Stas 2015-10-22 12:36:14 +03:00
commit a4b8003698
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/tasks/import.rake
View file

@ -190,8 +190,8 @@ namespace :import do
name,
x.organization.try(:strip),
x.object_registry.try(:registrar).try(:id),
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.country.try(:strip),
x.id,
[x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
@ -321,8 +321,8 @@ namespace :import do
SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
1,
'y',
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.id,
x.object_registry.try(:crid),
x.registrant,
@ -333,8 +333,8 @@ namespace :import do
x.domain_contact_maps.each do |dc|
domain_contacts << [
'AdminDomainContact',
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.id,
dc.contactid
]
@ -344,8 +344,8 @@ namespace :import do
x.nsset_contact_maps.each do |dc|
domain_contacts << [
'TechDomainContact',
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.id,
dc.contactid
]
@ -365,8 +365,8 @@ namespace :import do
host.fqdn.try(:strip),
ips[:ipv4].try(:strip),
ips[:ipv6].try(:strip),
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.id
]
end if x.nsset && x.nsset.hosts
@ -379,8 +379,8 @@ namespace :import do
key.key,
3, # ds_alg
1, # ds_digest_type /SHA1)
user,
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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.id
]
end