Merge remote-tracking branch 'upstream/pull/3226'

[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 2962ce070ffe15ebf1cd98f43cb66adaa568c767..62eb76505b6228f4c6530476024e7c8afbdae397 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -13,11 +13,13 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 

+    before_action :set_request_formats, :except => [:create, :update, :delete]
+

     # Create a node from XML.
     def create
       assert_method :put
 
     # Create a node from XML.
     def create
       assert_method :put
 

-      node = Node.from_xml(request.raw_post, true)
+      node = Node.from_xml(request.raw_post, :create => true)

 
       # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
       node.create_with_history current_user
 
       # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
       node.create_with_history current_user


@@ -32,7 +34,10 @@ module Api
 
       if @node.visible
         # Render the result
 
       if @node.visible
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -73,7 +78,10 @@ module Api
       @nodes = Node.find(ids)
 
       # Render the result
       @nodes = Node.find(ids)
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end