Merge branch 'release/v0.9.7'

bogdanRada · Dec 12, 2013 · 1459045 · 1459045
2 parents 99bdae6 + ad8ad5b
commit 1459045
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/helpers/washout_builder_helper.rb b/app/helpers/washout_builder_helper.rb
@@ -128,7 +128,7 @@ def get_fault_types(map)
     fault_types = []
     defined << WashOut::SOAPError
     defined.each{ |item|  get_fault_class_ancestors(item, fault_types, true)}  unless   defined.blank?
-    fault_types = fault_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq unless fault_types.blank?
+
     complex_types = []
     fault_types.each do |hash| 
       hash[:structure].each do |attribute, attr_details|
@@ -147,6 +147,8 @@ def get_fault_types(map)
 
       end 
     end
+    complex_types.delete_if{ |hash|  fault_types << hash if  hash[:fault].ancestors.include?(WashOut::SOAPError) }
+    fault_types = fault_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq unless fault_types.blank?  
     complex_types = complex_types.sort_by { |hash| hash[:fault].to_s.downcase }.uniq unless complex_types.blank?
     [fault_types, complex_types]
   end

diff --git a/lib/washout_builder/version.rb b/lib/washout_builder/version.rb
@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end