Merge branch '109367694-epp-id-conventions' into staging

This commit is contained in:
Matt Farnsworth 2015-12-03 18:52:27 +02:00
commit fd54c382c3
5 changed files with 18 additions and 16 deletions

View file

@ -504,6 +504,7 @@ class Epp::Domain < Domain
old_registrant_email = DomainMailer.registrant_updated_notification_for_old_registrant(id, deliver_emails)
preclean_pendings
user = ApiUser.find(pending_json['current_user_id'])
::PaperTrail.whodunnit = user.string # updator str should be the request originator not the approval user
frame = Nokogiri::XML(pending_json['frame'])
statuses.delete(DomainStatus::PENDING_UPDATE)
yield(self) if block_given? # need to skip statuses check here