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

[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 dafb19ebd618a38c773eab92fa7cce26d1ac5a16..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 :set_request_formats, :except => [:create, :update, :delete]
+
     # 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
@@ -34,6 +36,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -77,6 +80,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end