From f3a91873f348ccb7133db6351f675482bd282322 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Mon, 30 Nov 2015 11:42:27 +0200 Subject: [PATCH] Story #109070924 - change EPP to use all.xsd, requires prior commit that provides all.xsd --- app/controllers/epp_controller.rb | 5 +---- config/initializers/load_schemas.rb | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 15f6c6a49..a0e7d7dce 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -73,10 +73,7 @@ class EppController < ApplicationController end def schema - # TODO: Support multiple schemas - return DOMAIN_SCHEMA if params[:epp_object_type] == :domain - return CONTACT_SCHEMA if params[:epp_object_type] == :contact - EPP_SCHEMA + EPP_ALL_SCHEMA end def generate_svtrid diff --git a/config/initializers/load_schemas.rb b/config/initializers/load_schemas.rb index 617022179..91ca113cc 100644 --- a/config/initializers/load_schemas.rb +++ b/config/initializers/load_schemas.rb @@ -1,3 +1 @@ -EPP_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/epp-1.0.xsd")) -DOMAIN_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/domain-eis-1.0.xsd")) -CONTACT_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/contact-eis-1.0.xsd")) +EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/all-ee-1.0.xsd"))