From 188199292783d49a507fdaf1d4a113e7efa70911 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Tue, 13 Apr 2021 14:24:33 +0500 Subject: [PATCH 1/2] Fix domain history viewing pending_json --- app/views/admin/domains/partials/_version.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 4533c9293..6a278ea57 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -139,7 +139,7 @@ %td{colspan: 9} = preserve do %pre - - formatted_req = Nokogiri::XML(domain.pending_json['frame']) + - formatted_req = Nokogiri::XML(domain.pending_json['frame'].to_json) - if formatted_req.errors.none? = formatted_req - else From e78d01724e2586471bbe495960230abe3d5aa92a Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Tue, 13 Apr 2021 15:06:13 +0500 Subject: [PATCH 2/2] Fix empty nameserver domain names for history --- app/models/nameserver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index fff757b95..d19e1d548 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -58,8 +58,8 @@ class Nameserver < ApplicationRecord end def hostname=(hostname) - self[:hostname] = SimpleIDN.to_unicode(hostname).gsub(/\.+$/, '') - self[:hostname_puny] = SimpleIDN.to_ascii(hostname).gsub(/\.+$/, '') + self[:hostname] = SimpleIDN.to_unicode(hostname)&.gsub(/\.+$/, '') + self[:hostname_puny] = SimpleIDN.to_ascii(hostname)&.gsub(/\.+$/, '') end class << self