Merge branch '104940548-object_owner_fix' into staging

This commit is contained in:
Stas 2015-10-19 11:54:14 +03:00
commit e266c9310c

View file

@ -189,7 +189,7 @@ namespace :import do
x.object.authinfopw.try(:strip), x.object.authinfopw.try(:strip),
name, name,
x.organization.try(:strip), x.organization.try(:strip),
x.object_registry.try(:registrar).try(:id), x.object.try(:clid),
x.object_registry.try(:crid), x.object_registry.try(:crid),
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
x.country.try(:strip), x.country.try(:strip),
@ -222,6 +222,7 @@ namespace :import do
domain_columns = %w( domain_columns = %w(
name name
registrar_id
registered_at registered_at
valid_from valid_from
valid_to valid_to
@ -310,6 +311,7 @@ namespace :import do
domains << [ domains << [
x.object_registry.name.try(:strip), x.object_registry.name.try(:strip),
x.object.try(:clid),
x.object_registry.try(:crdate), x.object_registry.try(:crdate),
x.object_registry.try(:crdate), x.object_registry.try(:crdate),
x.exdate, x.exdate,