deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nakagawa.yo...@jp.fujitsu.com
Subject [PATCH] Core: Replaced obsoleted convert_to_json with xml_to_json helper in firewalls
Date Wed, 05 Sep 2012 05:32:14 GMT
From: Yoshiaki Nakagawa <nakagawa.yoshi@jp.fujitsu.com>

---
 server/lib/deltacloud/collections/firewalls.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/lib/deltacloud/collections/firewalls.rb b/server/lib/deltacloud/collections/firewalls.rb
index 42dc4ad..8b10f64 100644
--- a/server/lib/deltacloud/collections/firewalls.rb
+++ b/server/lib/deltacloud/collections/firewalls.rb
@@ -66,7 +66,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { convert_to_json(:firewall, @firewall) }
+            format.json { xml_to_json 'firewalls/show' }
           end
         end
       end
@@ -109,7 +109,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { convert_to_json(:firewall, @firewall) }
+            format.json { xml_to_json 'firewalls/show' }
           end
         end
       end
-- 
1.7.1



Mime
View raw message