zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-01 23:42:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story#116761157 - move variable when to delete orphans to settings

Browse source
This commit is contained in:
Vladimir Krylov 2016-05-27 14:31:16 +03:00
parent 35a67ce439
commit 01234e3c55
4 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ class Admin::SettingsController < AdminController
:admin_contacts_max_count,
:tech_contacts_min_count,
:tech_contacts_max_count,
:orphans_contacts_in_months,
:ds_digest_type,
:dnskeys_min_count,
:dnskeys_max_count,

2
app/models/contact.rb
View file

@ -185,7 +185,7 @@ class Contact < ActiveRecord::Base
%w(admin_contacts tech_contacts registrant).each do |type|
ver_scope << "(children->'#{type}')::jsonb <@ json_build_array(#{contact.id})::jsonb"
end
next if DomainVersion.where("created_at > ?", Time.now - 6.months).where(ver_scope.join(" OR ")).any?
next if DomainVersion.where("created_at > ?", Time.now - Setting.orphans_contacts_in_months.to_i.months).where(ver_scope.join(" OR ")).any?
next if contact.domains_present?
contact.destroy

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

@ -15,6 +15,7 @@
= render 'setting_row', var: :admin_contacts_max_count
= render 'setting_row', var: :tech_contacts_min_count
= render 'setting_row', var: :tech_contacts_max_count
= render 'setting_row', var: :orphans_contacts_in_months
= render 'setting_row', var: :ds_data_allowed
= render 'setting_row', var: :key_data_allowed
= render 'setting_row', var: :dnskeys_min_count