You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:45:24 UTC

svn commit: r962311 - /incubator/deltacloud/trunk/server/server.rb

Author: lutter
Date: Thu Jul  8 23:45:24 2010
New Revision: 962311

URL: http://svn.apache.org/viewvc?rev=962311&view=rev
Log:
Fixed default output format back to XML

Modified:
    incubator/deltacloud/trunk/server/server.rb

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=962311&r1=962310&r2=962311&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Thu Jul  8 23:45:24 2010
@@ -48,9 +48,9 @@ def filter_all(model)
     @elements = driver.send(model.to_sym, credentials, filter)
     instance_variable_set(:"@#{model}", @elements)
     respond_to do |format|
-      format.json { convert_to_json(singular, @elements) }
       format.html { haml :"#{model}/index" }
       format.xml { haml :"#{model}/index" }
+      format.json { convert_to_json(singular, @elements) }
     end
 end
 
@@ -58,9 +58,9 @@ def show(model)
   @element = driver.send(model, credentials, { :id => params[:id]} )
   instance_variable_set("@#{model}", @element)
   respond_to do |format|
-    format.json { convert_to_json(model, @element) }
     format.html { haml :"#{model.to_s.pluralize}/show" }
     format.xml { haml :"#{model.to_s.pluralize}/show" }
+    format.json { convert_to_json(model, @element) }
   end
 end
 
@@ -205,9 +205,9 @@ end
 def instance_action(name)
   @instance = driver.send(:"#{name}_instance", credentials, params[:id])
   respond_to do |format|
-    format.json {convert_to_json(:instance, @instance) }
     format.html { haml :"instances/show" }
     format.xml { haml :"instances/show" }
+    format.json {convert_to_json(:instance, @instance) }
   end
 end