diff --git a/app/controllers/admin/pending_deletes_controller.rb b/app/controllers/admin/pending_deletes_controller.rb index 2eda703bd..1f3511e6b 100644 --- a/app/controllers/admin/pending_deletes_controller.rb +++ b/app/controllers/admin/pending_deletes_controller.rb @@ -5,7 +5,7 @@ class Admin::PendingDeletesController < AdminController def update authorize! :update, :pending - if registrant_verification.domain_registrant_delete_confirm! + if registrant_verification.domain_registrant_delete_confirm!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else redirect_to admin_edit_domain_path(@domain.id), alert: t(:failure) @@ -15,7 +15,7 @@ class Admin::PendingDeletesController < AdminController def destroy authorize! :destroy, :pending - if registrant_verification.domain_registrant_delete_reject! + if registrant_verification.domain_registrant_delete_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_delete_confirms_controller.rb b/app/controllers/registrant/domain_delete_confirms_controller.rb index 209456808..ae4d8cb5f 100644 --- a/app/controllers/registrant/domain_delete_confirms_controller.rb +++ b/app/controllers/registrant/domain_delete_confirms_controller.rb @@ -21,19 +21,19 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) if params[:rejected] - if @registrant_verification.domain_registrant_delete_reject! - flash[:notice] = t(:registrant_domain_delete_rejected) + if @registrant_verification.domain_registrant_delete_reject!("email link #{current_user.username}") + flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true) else - flash[:alert] = t(:registrant_domain_delete_rejected_failed) + flash[:alert] = t(:registrant_domain_verification_rejected_failed) return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_delete_confirm! - flash[:notice] = t(:registrant_domain_delete_confirmed) + if @registrant_verification.domain_registrant_delete_confirm!("email link #{current_user.username}") + flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true) else - flash[:alert] = t(:registrant_domain_delete_confirmed_failed) + flash[:alert] = t(:registrant_domain_verification_confirmed_failed) return render 'show' end end diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index fc6fe27b8..97d9819f3 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,6 +1,6 @@ class DomainDeleteConfirmJob < Que::Job def run(domain_id, action, initiator = nil) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" + ::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)