From ce3b04bff0611e1ec4928fccd00ff889ee425d1b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 9 Apr 2018 00:42:22 +0300 Subject: [PATCH] Do not show discarded domain details in WHOIS #789 --- app/models/whois_record.rb | 9 ++++++++- app/views/for_models/whois_discarded.erb | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 app/views/for_models/whois_discarded.erb diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb index bd16e0c99..9f9b26c43 100644 --- a/app/models/whois_record.rb +++ b/app/models/whois_record.rb @@ -37,6 +37,12 @@ class WhoisRecord < ActiveRecord::Base h = HashWithIndifferentAccess.new return h if domain.blank? + if domain.discarded? + h[:name] = domain.name + h[:status] = ['deleteCandidate'] + return h + end + status_map = { 'ok' => 'ok (paid and in zone)' } @@ -102,7 +108,8 @@ class WhoisRecord < ActiveRecord::Base end def generated_body - template = Rails.root.join("app/views/for_models/whois.erb".freeze) + template_name = domain.discarded? ? 'whois_discarded.erb' : 'whois.erb' + template = Rails.root.join("app/views/for_models/#{template_name}".freeze) ERB.new(template.read, nil, "-").result(binding) end # rubocop:enable Metrics/MethodLength diff --git a/app/views/for_models/whois_discarded.erb b/app/views/for_models/whois_discarded.erb new file mode 100644 index 000000000..ecaa6f9af --- /dev/null +++ b/app/views/for_models/whois_discarded.erb @@ -0,0 +1,8 @@ +Estonia .ee Top Level Domain WHOIS server + +Domain: +name: <%= json['name'] %> +status: <%= json['status'] %> + +Estonia .ee Top Level Domain WHOIS server +More information at http://internet.ee