X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb953006a1a8fe2949f376e167dda963dfd784bd..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/controllers/api/nodes_controller.rb?ds=sidebyside diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb index 8a8068e7e..92779dd67 100644 --- a/app/controllers/api/nodes_controller.rb +++ b/app/controllers/api/nodes_controller.rb @@ -4,20 +4,22 @@ module Api class NodesController < ApiController require "xml/libxml" + 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 :require_public_data, :only => [:create, :update, :delete] - before_action :check_api_writable, :only => [:create, :update, :delete] - 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 @@ -32,7 +34,10 @@ module Api if @node.visible # Render the result - render formats: [:xml] + respond_to do |format| + format.xml + format.json + end else head :gone end @@ -73,7 +78,10 @@ module Api @nodes = Node.find(ids) # Render the result - render formats: [:xml] + respond_to do |format| + format.xml + format.json + end end end end