diff --git a/app/controllers/admin/domains/force_delete_controller.rb b/app/controllers/admin/domains/force_delete_controller.rb
index c61f050d2..e64012de7 100644
--- a/app/controllers/admin/domains/force_delete_controller.rb
+++ b/app/controllers/admin/domains/force_delete_controller.rb
@@ -22,7 +22,7 @@ module Admin
send_email
domain.update(contact_notification_sent_date: Time.zone.today)
else
- domain.update(template_name: params[:template_name])
+ domain.update(template_name: template_name)
end
end
@@ -34,6 +34,10 @@ module Admin
private
+ def template_name
+ domain.registrant.org? ? 'legal_person' : 'private_person'
+ end
+
def domain
@domain ||= Domain.find(params[:domain_id])
end
@@ -46,7 +50,7 @@ module Admin
DomainDeleteMailer.forced(domain: domain,
registrar: domain.registrar,
registrant: domain.registrant,
- template_name: params[:template_name]).deliver_now
+ template_name: template_name).deliver_now
end
def force_delete_type
diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb
index a76c14edd..932a3f75c 100644
--- a/app/views/admin/domains/_force_delete_dialog.html.erb
+++ b/app/views/admin/domains/_force_delete_dialog.html.erb
@@ -33,12 +33,6 @@
-
<% end %>
<%= render 'form' %>
-<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
+<%= render 'force_delete_dialog', domain: @domain %>
diff --git a/test/system/admin_area/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb
index 4ccc10923..6aa53be6c 100644
--- a/test/system/admin_area/domains/force_delete_test.rb
+++ b/test/system/admin_area/domains/force_delete_test.rb
@@ -42,6 +42,22 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
find(:css, '#soft_delete').set(true)
click_link_or_button 'Force delete domain'
end
+
+ @domain.reload
+ assert_equal template_name, @domain.template_name
+ end
+
+ def test_uses_legal_template_if_registrant_org
+ @domain.registrant.update(ident_type: 'org')
+
+ assert_emails 0 do
+ visit edit_admin_domain_url(@domain)
+ find(:css, '#soft_delete').set(true)
+ click_link_or_button 'Force delete domain'
+ end
+
+ @domain.reload
+ assert_equal template_name, @domain.template_name
end
def test_allows_to_skip_notifying_registrant_and_admin_contacts_by_email
@@ -71,4 +87,10 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
assert_no_button 'Schedule force delete'
assert_no_link 'Schedule force delete'
end
+
+ private
+
+ def template_name
+ @domain.registrant.org? ? 'legal_person' : 'private_person'
+ end
end