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

Merge branch 'task#104941754' into staging

Browse source
This commit is contained in:
Stas 2015-10-30 17:25:14 +02:00
commit 3052b98f07
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/legacy/object_history.rb Normal file
View file

@ -0,0 +1,12 @@
module Legacy
class ObjectHistory < Db
self.table_name = :object_history
belongs_to :object_registry, foreign_key: :historyid
def self.instance_method_already_implemented?(method_name)
return true if method_name == 'update'
super
end
end
end

1
app/models/legacy/object_registry.rb
View file

@ -3,5 +3,6 @@ module Legacy
self.table_name = :object_registry self.table_name = :object_registry
self.inheritance_column = nil self.inheritance_column = nil
belongs_to :registrar, foreign_key: :crid, primary_key: :legacy_id, class_name: '::Registrar' belongs_to :registrar, foreign_key: :crid, primary_key: :legacy_id, class_name: '::Registrar'
belongs_to :object_history, foreign_key: :historyid
end end
end end

4
lib/tasks/import.rake
View file

@ -374,7 +374,7 @@ namespace :import do
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : 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, x.id,
nsset.object_registry.try(:crdate), nsset.object_registry.try(:crdate),
nsset.object.read_attribute(:update).nil? ? x.object_registry.try(:crdate) : x.object.read_attribute(:update) nsset.object_registry.try(:object_history).read_attribute(:update).nil? ? nsset.object_registry.try(:crdate) : nsset.object_registry.try(:object_history).read_attribute(:update)
] ]
end if x.nsset && x.nsset.hosts end if x.nsset && x.nsset.hosts
@ -389,7 +389,7 @@ namespace :import do
x.object_registry.try(:registrar).try(:name), 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.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
key.object.read_attribute(:update).nil? ? x.object_registry.try(:crdate) : x.object.read_attribute(:update) key.object_registry.try(:object_history).read_attribute(:update).nil? ? key.try(:crdate) : key.object_registry.try(:object_history).read_attribute(:update)
] ]
end end