From a809329421ecd2280e42016b70a60649302a0907 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 29 Jul 2015 00:01:40 +0300 Subject: [PATCH] Turn on pending delete/change settings #2785 --- app/controllers/admin/settings_controller.rb | 4 +++- app/models/epp/domain.rb | 7 +++++-- app/views/admin/settings/index.haml | 2 ++ config/initializers/initial_settings.rb | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 7cdcf323b..615ee63ca 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -68,7 +68,9 @@ class Admin::SettingsController < AdminController :key_data_allowed, :client_side_status_editing_enabled, :registrar_ip_whitelist_enabled, - :api_ip_whitelist_enabled + :api_ip_whitelist_enabled, + :request_confrimation_on_registrant_change_enabled, + :request_confirmation_on_domain_deletion_enabled ] params[:settings].each do |k, v| diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index c1ff9ae8d..a11e6152b 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -411,7 +411,7 @@ class Epp::Domain < Domain # at[:statuses] += at_add[:domain_statuses_attributes] - if verify && + if verify && Setting.request_confrimation_on_registrant_change_enabled && frame.css('registrant').present? && frame.css('registrant').attr('verified').to_s.downcase != 'yes' registrant_verification_asked!(frame.to_s, current_user.id) @@ -457,7 +457,10 @@ class Epp::Domain < Domain def epp_destroy(frame, user_id, verify = true) return false unless valid? - if verify && frame.css('delete').attr('verified').to_s.downcase != 'yes' + if verify && + Setting.request_confirmation_on_domain_deletion_enabled && + frame.css('delete').attr('verified').to_s.downcase != 'yes' + registrant_verification_asked!(frame.to_s, user_id) self.deliver_emails = true # turn on email delivery for epp pending_delete! diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml index 7b727146d..2c46c1f2e 100644 --- a/app/views/admin/settings/index.haml +++ b/app/views/admin/settings/index.haml @@ -52,6 +52,8 @@ = render 'setting_row', var: :client_side_status_editing_enabled = render 'setting_row', var: :api_ip_whitelist_enabled = render 'setting_row', var: :registrar_ip_whitelist_enabled + = render 'setting_row', var: :request_confrimation_on_registrant_change_enabled + = render 'setting_row', var: :request_confirmation_on_domain_deletion_enabled .panel.panel-default .panel-heading.clearfix diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb index 9fbea8343..c2d867c26 100644 --- a/config/initializers/initial_settings.rb +++ b/config/initializers/initial_settings.rb @@ -22,6 +22,8 @@ if con.present? && con.table_exists?('settings') Setting.save_default(:ns_max_count, 11) Setting.save_default(:transfer_wait_time, 0) + Setting.save_default(:request_confrimation_on_registrant_change_enabled, true) + Setting.save_default(:request_confirmation_on_domain_deletion_enabled, true) Setting.save_default(:client_side_status_editing_enabled, false)