Move default_format_xml to api_controller

[rails.git] / app / controllers / api / nodes_controller.rb

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 630149a749b270b3b36bc074a6afecdff9189be4..08f19008f730dc931e251b421ba2ca4dca134ca3 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -13,6 +13,8 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
+    before_action :default_format_xml
+
     # Create a node from XML.
     def create
       assert_method :put
@@ -26,16 +28,15 @@ module Api
 
     # Dump the details on a node given in params[:id]
     def show
-      node = Node.find(params[:id])
-
-      response.last_modified = node.timestamp
+      @node = Node.find(params[:id])
 
-      if node.visible
-        @nodes = [node]
+      response.last_modified = @node.timestamp
 
+      if @node.visible
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -79,6 +80,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end