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

Story 109367694 - refactor method name

Browse source
This commit is contained in:
Matt Farnsworth 2015-12-04 15:38:48 +02:00
parent 3f906b5ac6
commit e5a0149d1e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -67,7 +67,7 @@ class ApplicationController < ActionController::Base
end end
def user_log_str(user) def user_log_str(user)
user.nil? ? 'public' : user.string user.nil? ? 'public' : user.id_role_username
end end
def comma_support_for(parent_key, key) def comma_support_for(parent_key, key)

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

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

2
app/models/user.rb
View file

@ -4,7 +4,7 @@ class User < ActiveRecord::Base
attr_accessor :phone attr_accessor :phone
def string def id_role_username
"#{self.id}-#{self.class}: #{self.username}" "#{self.id}-#{self.class}: #{self.username}"
end end