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 1827603a70ce0e9de23e3567085b058ed79eb870..62eb76505b6228f4c6530476024e7c8afbdae397 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -13,18 +13,13 @@ 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
-
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
+    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