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

[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 fb808828c80a221d794b205cd256d28f34b7af7c..5aad78dbffb91bfc99c36f36adcbb20893b2d5dc 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -2,10 +2,7 @@
 
 module Api
   class NodesController < ApiController
 
 module Api
   class NodesController < ApiController

-    require "xml/libxml"
-

     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_writable, :only => [:create, :update, :delete]

-    before_action :check_api_readable, :except => [:create, :update, :delete]

     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource


@@ -52,8 +49,6 @@ module Api
 
     # Create a node from XML.
     def create
 
     # Create a node from XML.
     def create

-      assert_method :put
-

       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 = 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