Show old contacts in transfer poll #2453

This commit is contained in:
Martin Lensment 2015-06-18 17:33:29 +03:00
parent b5167213d9
commit 67dfda9bc7
4 changed files with 15 additions and 8 deletions

View file

@ -51,9 +51,9 @@ class DomainTransfer < ActiveRecord::Base
end
end
def notify_losing_registrar
def notify_losing_registrar(contacts, registrant)
transfer_from.messages.create!(
body: I18n.t('domain_transfer_was_approved', contacts: domain.contacts.pluck(:code).sort),
body: I18n.t('domain_transfer_was_approved', contacts: contacts, registrant: registrant),
attached_obj_id: id,
attached_obj_type: self.class.to_s
)

View file

@ -527,6 +527,9 @@ class Epp::Domain < Domain
def query_transfer(frame, current_user)
return false unless can_be_transferred_to?(current_user.registrar)
old_contact_codes = contacts.pluck(:code).sort.uniq
old_registrant_code = registrant.code
transaction do
begin
dt = domain_transfers.create!(
@ -545,7 +548,7 @@ class Epp::Domain < Domain
if dt.approved?
transfer_contacts(current_user.registrar_id)
dt.notify_losing_registrar
dt.notify_losing_registrar(old_contact_codes, old_registrant_code)
generate_auth_info
self.registrar = current_user.registrar
end

View file

@ -525,7 +525,7 @@ en:
client_side_status_editing_error: 'Parameter value policy error. Client-side object status management not supported'
switch_to: Switch to
admin_menu: Admin
domain_transfer_was_approved: 'Domain transfer was approved, associated contacts are: %{contacts}'
domain_transfer_was_approved: 'Domain transfer was approved, associated contacts were: %{contacts} and registrant was %{registrant}'
# DEPP
activemodel:

View file

@ -732,6 +732,9 @@ describe 'EPP Domain', epp: true do
]
})
old_contact_codes = domain.contacts.pluck(:code).sort.uniq
old_registrant_code = domain.registrant.code
response = login_as :registrar2 do
epp_plain_request(xml)
end
@ -755,8 +758,9 @@ describe 'EPP Domain', epp: true do
response[:msg].should == 'Command completed successfully; ack to dequeue'
msg_q = response[:parsed].css('msgQ')
msg_q.css('qDate').text.should_not be_blank
contacts = domain.contacts.pluck(:code).sort
msg_q.css('msg').text.should == "Domain transfer was approved, associated contacts are: #{contacts}"
msg_q.css('msg').text.should == "Domain transfer was approved, associated contacts were: " \
"#{old_contact_codes} and registrant was #{old_registrant_code}"
msg_q.first['id'].should_not be_blank
msg_q.first['count'].should == '1'