Merge branch 'task#104941754' into staging

# Conflicts:
#	lib/tasks/import.rake
This commit is contained in:
Vladimir Krylov 2015-10-30 12:42:51 +02:00
commit 821e864bc3
3 changed files with 25 additions and 11 deletions

View file

@ -1,5 +1,8 @@
module Legacy
class Dnskey < Db
self.table_name = :dnskey
belongs_to :object_registry, foreign_key: :id
belongs_to :object, foreign_key: :id
end
end

View file

@ -2,6 +2,8 @@ module Legacy
class Nsset < Db
self.table_name = :nsset
belongs_to :object, foreign_key: :id
belongs_to :object_state, foreign_key: :id, primary_key: :object_id
has_many :hosts, foreign_key: :nssetid
end
end