zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 17:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '111864739-history_legal_doc' into staging

Browse source
This commit is contained in:
Stas 2016-02-01 18:19:19 +02:00
commit 219eb69671
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/epp/contact.rb
View file

@ -38,7 +38,9 @@ class Epp::Contact < Contact
legal_frame = f.css('legalDocument').first
if legal_frame.present?
at[:legal_documents_attributes] = legal_document_attrs(legal_frame)
doc = legal_document_attrs(legal_frame)
self.legal_document_id = doc.id if doc.id
at[:legal_documents_attributes] = doc
end
at.merge!(ident_attrs(f.css('ident').first)) if new_record
at

20
app/models/epp/domain.rb
View file

@ -194,7 +194,10 @@ class Epp::Domain < Domain
end
at[:dnskeys_attributes] = dnskeys_attrs(dnskey_frame, action)
at[:legal_documents_attributes] = legal_document_from(frame)
doc = legal_document_from(frame)
self.legal_document_id = doc.id if doc.id
at[:legal_documents_attributes] = doc
at
end
# rubocop: enable Metrics/PerceivedComplexity
@ -476,7 +479,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
self.legal_document_id = doc.id if doc.id
end
at_add = attrs_from(frame.css('add'), current_user, 'add')
@ -546,6 +549,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
end
if Setting.request_confirmation_on_domain_deletion_enabled &&
@ -699,10 +703,8 @@ class Epp::Domain < Domain
self.registrar = current_user.registrar
end
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
# we want to transfer data to new owner at any case.
# We also hope that if domain is not valid, new registrar would be better.
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
self.legal_document_id = doc.id if doc.id
save!(validate: false)
return dt
@ -730,7 +732,8 @@ class Epp::Domain < Domain
generate_auth_info
self.registrar = pt.transfer_to
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
self.legal_document_id = doc.id if doc.id
save!(validate: false)
end
@ -751,7 +754,8 @@ class Epp::Domain < Domain
status: DomainTransfer::CLIENT_REJECTED
)
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
doc = attach_legal_document(self.class.parse_legal_document_from_frame(frame))
self.legal_document_id = doc.id if doc.id
save!(validate: false)
end