mirror of
https://github.com/internetee/registry.git
synced 2025-07-14 06:55:11 +02:00
Merge branch '111864739-history_legal_doc' into staging
This commit is contained in:
commit
a18df56c18
2 changed files with 4 additions and 28 deletions
|
@ -2,7 +2,6 @@ class Contact < ActiveRecord::Base
|
|||
include Versions # version/contact_version.rb
|
||||
include EppErrors
|
||||
include UserEvents
|
||||
has_paper_trail class_name: "ContactVersion", meta: { children: :children_log }
|
||||
|
||||
belongs_to :registrar
|
||||
has_many :domain_contacts
|
||||
|
@ -10,15 +9,11 @@ class Contact < ActiveRecord::Base
|
|||
has_many :legal_documents, as: :documentable
|
||||
has_many :registrant_domains, class_name: 'Domain', foreign_key: 'registrant_id' # when contant is registrant
|
||||
|
||||
attr_accessor :legal_document_id
|
||||
|
||||
# TODO: remove later
|
||||
has_many :depricated_statuses, class_name: 'DepricatedContactStatus', dependent: :destroy
|
||||
|
||||
accepts_nested_attributes_for :legal_documents
|
||||
|
||||
before_save :catch_legal_doc_id
|
||||
|
||||
validates :name, :phone, :email, :ident, :ident_type,
|
||||
:street, :city, :zip, :country_code, :registrar, presence: true
|
||||
|
||||
|
@ -511,19 +506,4 @@ class Contact < ActiveRecord::Base
|
|||
RegenerateWhoisRecordJob.enqueue related_domain_descriptions.keys, :name
|
||||
end
|
||||
|
||||
def children_log
|
||||
log = HashWithIndifferentAccess.new
|
||||
log[:legal_documents]= [legal_document_id]
|
||||
log
|
||||
end
|
||||
|
||||
def catch_legal_doc_id
|
||||
|
||||
if !legal_document_id && doc = self.legal_documents.last.new_record?
|
||||
|
||||
legal_document_id = doc.id
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -476,7 +476,7 @@ class Epp::Domain < Domain
|
|||
|
||||
if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame))
|
||||
frame.css("legalDocument").first.content = doc.path if doc && doc.persisted?
|
||||
self.legal_document_id = doc.id if doc.id
|
||||
self.legal_document_id = doc.id
|
||||
end
|
||||
|
||||
at_add = attrs_from(frame.css('add'), current_user, 'add')
|
||||
|
@ -546,7 +546,6 @@ class Epp::Domain < Domain
|
|||
|
||||
if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame))
|
||||
frame.css("legalDocument").first.content = doc.path if doc && doc.persisted?
|
||||
self.legal_document_id = doc.id if doc.id
|
||||
end
|
||||
|
||||
if Setting.request_confirmation_on_domain_deletion_enabled &&
|
||||
|
@ -700,8 +699,7 @@ class Epp::Domain < Domain
|
|||
self.registrar = current_user.registrar
|
||||
end
|
||||
|
||||
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
self.legal_document_id = doc.id if doc.id
|
||||
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
save!(validate: false)
|
||||
|
||||
return dt
|
||||
|
@ -729,8 +727,7 @@ class Epp::Domain < Domain
|
|||
generate_auth_info
|
||||
self.registrar = pt.transfer_to
|
||||
|
||||
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
self.legal_document_id = doc.id if doc.id
|
||||
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
save!(validate: false)
|
||||
end
|
||||
|
||||
|
@ -751,8 +748,7 @@ class Epp::Domain < Domain
|
|||
status: DomainTransfer::CLIENT_REJECTED
|
||||
)
|
||||
|
||||
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
self.legal_document_id = doc.id if doc.id
|
||||
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
|
||||
save!(validate: false)
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue