diff --git a/app/models/domain.rb b/app/models/domain.rb index 4608b83c0..0f1933144 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -694,7 +694,7 @@ class Domain < ActiveRecord::Base def admin_status_update(update) # check for deleted status statuses.each do |s| - unless update.includes? s + unless update.include? s case s when DomainStatus::PENDING_DELETE self.delete_at = nil diff --git a/app/views/admin/domains/form/_pending_delete.haml b/app/views/admin/domains/form/_pending_delete.haml index e3d71f3f4..ad1844634 100644 --- a/app/views/admin/domains/form/_pending_delete.haml +++ b/app/views/admin/domains/form/_pending_delete.haml @@ -2,7 +2,3 @@ = link_to(t(:accept_delete), admin_domain_pending_delete_path(f.object.id, f.object.id), method: :patch, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs') - - = link_to(t(:reject_delete), admin_domain_pending_delete_path(f.object.id, f.object.id), - method: :delete, data: { confirm: t(:are_you_sure) }, - class: 'btn btn-danger btn-xs')