From 5ccc76c08c6009a7e4cc558cf72122c1e0f693db Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Thu, 15 Oct 2015 16:53:34 +0300
Subject: [PATCH 1/2] #104941754 updator_str import fix

---
 lib/tasks/import.rake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 54f85b105..882ab55d0 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -191,7 +191,7 @@ namespace :import do
           x.organization.try(:strip),
           x.object_registry.try(:registrar).try(:id),
           user,
-          user,
+          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"),
@@ -320,7 +320,7 @@ namespace :import do
           1,
           'y',
           user,
-          user,
+          x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
           x.id,
           x.object_registry.try(:crid),
           x.registrant,
@@ -332,7 +332,7 @@ namespace :import do
           domain_contacts << [
             'AdminDomainContact',
             user,
-            user,
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
           ]
@@ -343,7 +343,7 @@ namespace :import do
           domain_contacts << [
             'TechDomainContact',
             user,
-            user,
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
           ]
@@ -364,7 +364,7 @@ namespace :import do
             ips[:ipv4].try(:strip),
             ips[:ipv6].try(:strip),
             user,
-            user,
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id
           ]
         end if x.nsset && x.nsset.hosts
@@ -378,7 +378,7 @@ namespace :import do
             3, # ds_alg
             1, # ds_digest_type /SHA1)
             user,
-            user,
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id
           ]
         end

From 76b83deb1eb042ac9173cc6b8b6cbd4cd5617d27 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Thu, 15 Oct 2015 17:01:07 +0300
Subject: [PATCH 2/2] task#104941314 creator_str value fix

---
 lib/tasks/import.rake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 882ab55d0..acf2ad38c 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -190,7 +190,7 @@ namespace :import do
           name,
           x.organization.try(:strip),
           x.object_registry.try(:registrar).try(:id),
-          user,
+          x.object_registry.try(:crid),
           x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
           x.country.try(:strip),
           x.id,
@@ -319,7 +319,7 @@ namespace :import do
           SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
           1,
           'y',
-          user,
+          x.object_registry.try(:crid),
           x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
           x.id,
           x.object_registry.try(:crid),
@@ -331,7 +331,7 @@ namespace :import do
         x.domain_contact_maps.each do |dc|
           domain_contacts << [
             'AdminDomainContact',
-            user,
+            x.object_registry.try(:crid),
             x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
@@ -342,7 +342,7 @@ namespace :import do
         x.nsset_contact_maps.each do |dc|
           domain_contacts << [
             'TechDomainContact',
-            user,
+            x.object_registry.try(:crid),
             x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
@@ -363,7 +363,7 @@ namespace :import do
             host.fqdn.try(:strip),
             ips[:ipv4].try(:strip),
             ips[:ipv6].try(:strip),
-            user,
+            x.object_registry.try(:crid),
             x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id
           ]