Merge branch 'task#104941754' into staging

This commit is contained in:
Stas 2015-10-23 19:43:40 +03:00
commit ebded08bf4

View file

@ -148,6 +148,7 @@ namespace :import do
email
fax
created_at
updated_at
ident
ident_type
auth_info
@ -184,6 +185,7 @@ namespace :import do
[x.email.try(:strip), x.notifyemail.try(:strip)].uniq.select(&:present?).join(', '),
x.fax.try(:strip),
x.object_registry.try(:crdate),
x.object.respond_to?(:update) && x.object.read_attribute(:update),
x.ssn.try(:strip),
ident_type_map[x.ssntype],
x.object.authinfopw.try(:strip),
@ -228,6 +230,7 @@ namespace :import do
valid_to
auth_info
created_at
updated_at
name_dirty
name_puny
period
@ -317,6 +320,7 @@ namespace :import do
x.exdate,
x.object.authinfopw.try(:strip),
x.object_registry.try(:crdate),
x.object.respond_to?(:update) && x.object.read_attribute(:update),
x.object_registry.name.try(:strip),
SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
1,