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

Merge branch '115693873-whodunnit_empty' into staging

Browse source
This commit is contained in:
Stas 2016-06-16 16:36:16 +03:00
commit 50830b2a09
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/pending_deletes_controller.rb
View file

@ -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)

12
app/controllers/registrant/domain_delete_confirms_controller.rb
View file

@ -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

2
app/jobs/domain_delete_confirm_job.rb
View file

@ -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)