From b9575661eb2d45f444e0fae4b60ee1ce721ab528 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 5 Dec 2019 12:12:49 +0500 Subject: [PATCH] Add both types of delete procedure to the view/controller --- .../admin/domains/force_delete_controller.rb | 10 +++++++++- .../admin/domains/_force_delete_dialog.html.erb | 12 ++++++++++++ config/locales/admin/domains.en.yml | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/domains/force_delete_controller.rb b/app/controllers/admin/domains/force_delete_controller.rb index b01962fc7..36835bfe5 100644 --- a/app/controllers/admin/domains/force_delete_controller.rb +++ b/app/controllers/admin/domains/force_delete_controller.rb @@ -5,7 +5,7 @@ module Admin authorize! :manage, domain domain.transaction do - domain.schedule_force_delete + domain.schedule_force_delete(type: force_delete_type) domain.registrar.notifications.create!(text: t('force_delete_set_on_domain', domain_name: domain.name)) @@ -35,6 +35,14 @@ module Admin def notify_by_email? ActiveRecord::Type::Boolean.new.cast(params[:notify_by_email]) end + + def force_delete_type + soft_delete? ? :soft : :fast_track + end + + def soft_delete? + ActiveRecord::Type::Boolean.new.cast(params[:soft_delete]) + end end end end diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index 26edf3756..6287abffe 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -10,6 +10,18 @@ <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', class: 'modal-body form-horizontal' do %> +
+
+
+ +
+
+
+
diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index 2abdaee91..c6e96bb15 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -31,6 +31,7 @@ en: force_delete_dialog: title: Force delete notify_by_email: Notify registrant and administrative contacts by email + use_soft_delete: Use soft delete procedure email_template: Email template close_btn: Close dialog submit_btn: Force delete domain