Merge branch 'task#104941754' into staging

This commit is contained in:
Stas 2015-10-30 18:02:58 +02:00
commit 0feb367aba

View file

@ -389,7 +389,7 @@ namespace :import do
x.object_registry.try(:registrar).try(:name),
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id,
key.object_registry.try(:object_history).read_attribute(:update).nil? ? key.try(:crdate) : key.object_registry.try(:object_history).read_attribute(:update)
key.object_registry.try(:object_history).read_attribute(:update).nil? ? key.try(:crdate)||Time.zone.now : key.object_registry.try(:object_history).read_attribute(:update)
]
end