Merge branch 'master' into cancancan

[rails.git] / app / controllers / node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 20baf6bb4d0285575e8faa14d92ce08fc23e4bd8..84b814a34529fae1cd3c5be327b418e5c47a04b3 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -54,6 +54,7 @@ class NodeController < ApplicationController
     new_node = Node.from_xml(request.raw_post)
 
     raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id
     new_node = Node.from_xml(request.raw_post)
 
     raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id

+

     node.delete_with_history!(new_node, current_user)
     render :plain => node.version.to_s
   end
     node.delete_with_history!(new_node, current_user)
     render :plain => node.version.to_s
   end


@@ -65,6 +66,7 @@ class NodeController < ApplicationController
     ids = params["nodes"].split(",").collect(&:to_i)
 
     raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?
     ids = params["nodes"].split(",").collect(&:to_i)
 
     raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?

+

     doc = OSM::API.new.get_xml_doc
 
     Node.find(ids).each do |node|
     doc = OSM::API.new.get_xml_doc
 
     Node.find(ids).each do |node|