From 436846cfe9426e2d2cad0f284853610eab1de416 Mon Sep 17 00:00:00 2001 From: Stas Date: Sun, 31 Jul 2016 19:38:41 +0300 Subject: [PATCH] 118822101-builder_changes_for_array_error (cherry picked from commit e7841b5) --- app/models/nameserver.rb | 2 +- app/views/epp/error.xml.builder | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index 86cd7e002..7b4daab3d 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -24,7 +24,7 @@ class Nameserver < ActiveRecord::Base def epp_code_map { '2302' => [ - [:hostname, :taken, { value: { obj: 'hostAttr', val: hostname } }] + [:hostname, :taken, { value: { obj: 'hostAttr', val: {'hostName': hostname} } }] ], '2005' => [ [:hostname, :invalid, { value: { obj: 'hostAttr', val: hostname } }], diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index 7dac4907a..fceb800b7 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -12,7 +12,13 @@ xml.epp_head do if (val = value).respond_to?(:each) val.each do |el| - xml.tag!("#{model_name}:#{x[:value][:obj]}", el, attrs) + if el.kind_of?(Array) + xml.tag!("#{model_name}:#{x[:value][:obj]}") do + xml.tag!("#{model_name}:#{el[0]}", el[1], attrs) + end + else + xml.tag!("#{model_name}:#{x[:value][:obj]}", el, attrs) + end end else xml.tag!("#{model_name}:#{x[:value][:obj]}", val, attrs)