From d360f52434e61aa71da14e2a59a239a24b5df023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 12 Aug 2020 10:38:46 +0300 Subject: [PATCH] Bridge Setting calls to SettingEntry --- app/models/setting.rb | 76 ++----------------------------------------- 1 file changed, 3 insertions(+), 73 deletions(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 86d3dff35..afa570c88 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -1,74 +1,4 @@ -class Setting < RailsSettings::Base - include Versions # version/setting_version.rb - source Rails.root.join('config', 'app.yml') - - # When config/app.yml has changed, you need change this prefix to v2, v3 ... to expires caches - cache_prefix { 'v2' } - - def self.reload_settings! - STDOUT << "#{Time.zone.now.utc} - Clearing settings cache\n" - Rails.cache.delete_matched('settings:.*') - STDOUT << "#{Time.zone.now.utc} - Settings cache cleared\n" - end - - - # cannot do instance validation because CachedSetting use save! - def self.params_errors(params) - errors = {} - # DS data allowed and Allow key data cannot be both true - if !!params["key_data_allowed"] && params["key_data_allowed"] == params["ds_data_allowed"] - msg = "#{I18n.t(:key_data_allowed)} and #{I18n.t(:ds_data_with_key_allowed)} cannot be both true" - errors["key_data_allowed"] = msg - errors["ds_data_allowed"] = msg - end - - return errors - end - - def self.integer_settings - %i[ - admin_contacts_min_count - 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 - ns_min_count - ns_max_count - transfer_wait_time - invoice_number_min - invoice_number_max - days_to_keep_invoices_active - days_to_keep_overdue_invoices_active - days_to_renew_domain_before_expire - expire_warning_period - redemption_grace_period - expire_pending_confirmation - dispute_period_in_months - ] - end - - def self.float_settings - %i[ - registry_vat_prc - minimum_deposit - ] - end - - def self.boolean_settings - %i[ - ds_data_allowed - key_data_allowed - client_side_status_editing_enabled - registrar_ip_whitelist_enabled - api_ip_whitelist_enabled - request_confrimation_on_registrant_change_enabled - request_confirmation_on_domain_deletion_enabled - nameserver_required - address_processing - legal_document_is_mandatory - ] - end +# frozen_string_literal: true +class Setting < SettingEntry + # Bridge Setting calls to SettingEntry, so we don't have to drop legacy settings yet end