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

Merge branch 'staging' of https://github.com/internetee/registry into staging

Browse source
This commit is contained in:
Georg Kahest 2015-12-03 18:52:58 +02:00
commit 51394c795e
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/epp/domain.rb
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

5
app/models/user.rb
View file

@ -3,4 +3,9 @@ class User < ActiveRecord::Base
devise :trackable, :timeoutable
attr_accessor :phone
def string
"#{self.id}-#{self.class}: #{self.username}"
end
end