diff --git a/app/controllers/admin/pending_updates_controller.rb b/app/controllers/admin/pending_updates_controller.rb index 6e41a6c57..8da05c480 100644 --- a/app/controllers/admin/pending_updates_controller.rb +++ b/app/controllers/admin/pending_updates_controller.rb @@ -5,7 +5,7 @@ class Admin::PendingUpdatesController < AdminController def update authorize! :update, :pending - if registrant_verification.domain_registrant_change_confirm! + if registrant_verification.domain_registrant_change_confirm!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else redirect_to edit_admin_domain_path(@domain.id), alert: t(:failure) @@ -14,7 +14,7 @@ class Admin::PendingUpdatesController < AdminController def destroy authorize! :destroy, :pending - if registrant_verification.domain_registrant_change_reject! + if registrant_verification.domain_registrant_change_reject!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_removed) else redirect_to admin_domain_path(@domain.id), alert: t(:failure) diff --git a/app/controllers/registrant/domain_update_confirms_controller.rb b/app/controllers/registrant/domain_update_confirms_controller.rb index 598681d7a..75f313ea8 100644 --- a/app/controllers/registrant/domain_update_confirms_controller.rb +++ b/app/controllers/registrant/domain_update_confirms_controller.rb @@ -21,7 +21,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) if params[:rejected] - if @registrant_verification.domain_registrant_change_reject! + if @registrant_verification.domain_registrant_change_reject!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_update_confirm_path(@domain.id, rejected: true) else @@ -29,7 +29,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_change_confirm! + if @registrant_verification.domain_registrant_change_confirm!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_update_confirm_path(@domain.id, confirmed: true) else diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index e3bb47dae..f1f821d8d 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,5 +1,5 @@ class DomainDeleteConfirmJob < Que::Job - def run(domain_id, action) + def run(domain_id, action, initiator) ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 718ecc7be..94ecc6b17 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,6 +1,6 @@ class DomainUpdateConfirmJob < Que::Job - def run(domain_id, action) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" + def run(domain_id, action, initiator) + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) diff --git a/app/models/registrant_verification.rb b/app/models/registrant_verification.rb index 253bac630..95e24d36b 100644 --- a/app/models/registrant_verification.rb +++ b/app/models/registrant_verification.rb @@ -13,27 +13,27 @@ class RegistrantVerification < ActiveRecord::Base validates :verification_token, :domain_name, :domain, :action, :action_type, presence: true - def domain_registrant_change_confirm! + def domain_registrant_change_confirm!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = CONFIRMED - DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED if save + DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED, initiator if save end - def domain_registrant_change_reject! + def domain_registrant_change_reject!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = REJECTED - DomainUpdateConfirmJob.run domain.id, REJECTED if save + DomainUpdateConfirmJob.run domain.id, REJECTED, initiator if save end - def domain_registrant_delete_confirm! + def domain_registrant_delete_confirm!(initiator) self.action_type = DOMAIN_DELETE self.action = CONFIRMED - DomainDeleteConfirmJob.enqueue domain.id, CONFIRMED if save + DomainDeleteConfirmJob.enqueue domain.id, CONFIRMED, initiator if save end - def domain_registrant_delete_reject! + def domain_registrant_delete_reject!(initiator) self.action_type = DOMAIN_DELETE self.action = REJECTED - DomainDeleteConfirmJob.enqueue domain.id, REJECTED if save + DomainDeleteConfirmJob.enqueue domain.id, REJECTED, initiator if save end end