zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 01:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story #109367694 - fix merge error

Browse source
This commit is contained in:
Matt Farnsworth 2015-12-14 12:00:05 +02:00
parent 22dc754360
commit 6fe813e685
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,13 +503,12 @@ 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.id_role_username # 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
::PaperTrail.whodunnit = user.id_role_username # updator str should be the request originator not the approval user
self.save
::PaperTrail.whodunnit = user.id_role_username # updator str should be the request originator not the approval user
return unless update(frame, user, false)
clean_pendings!
self.deliver_emails = true # turn on email delivery