zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Turn on pending delete/change settings #2785

Browse source
This commit is contained in:
Priit Tark 2015-07-29 00:01:40 +03:00
parent 446576f5b0
commit a809329421
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,9 @@ class Admin::SettingsController < AdminController
:key_data_allowed, :key_data_allowed,
:client_side_status_editing_enabled, :client_side_status_editing_enabled,
:registrar_ip_whitelist_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| params[:settings].each do |k, v|

7
app/models/epp/domain.rb
View file

@ -411,7 +411,7 @@ class Epp::Domain < Domain
# at[:statuses] += at_add[:domain_statuses_attributes] # 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').present? &&
frame.css('registrant').attr('verified').to_s.downcase != 'yes' frame.css('registrant').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!(frame.to_s, current_user.id) 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) def epp_destroy(frame, user_id, verify = true)
return false unless valid? 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) registrant_verification_asked!(frame.to_s, user_id)
self.deliver_emails = true # turn on email delivery for epp self.deliver_emails = true # turn on email delivery for epp
pending_delete! pending_delete!

2
app/views/admin/settings/index.haml
View file

@ -52,6 +52,8 @@
= render 'setting_row', var: :client_side_status_editing_enabled = render 'setting_row', var: :client_side_status_editing_enabled
= render 'setting_row', var: :api_ip_whitelist_enabled = render 'setting_row', var: :api_ip_whitelist_enabled
= render 'setting_row', var: :registrar_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.panel-default
.panel-heading.clearfix .panel-heading.clearfix

2
config/initializers/initial_settings.rb
View file

@ -22,6 +22,8 @@ if con.present? && con.table_exists?('settings')
Setting.save_default(:ns_max_count, 11) Setting.save_default(:ns_max_count, 11)
Setting.save_default(:transfer_wait_time, 0) 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) Setting.save_default(:client_side_status_editing_enabled, false)