Clear the openid URL when an account is deleted

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 416ae28ebb3af3aa89ba4e78c6eda3e21a20530b..5064a3c0b64a41e3069144e47678df91f69deda3 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -3,6 +3,7 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

+  skip_before_filter :verify_authenticity_token

   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :require_allow_write_api, :only => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :require_allow_write_api, :only => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]


@@ -26,7 +27,7 @@ class NodeController < ApplicationController
   def read
     node = Node.find(params[:id])
     if node.visible?
   def read
     node = Node.find(params[:id])
     if node.visible?

-      response.headers['Last-Modified'] = node.timestamp.rfc822
+      response.last_modified = node.timestamp

       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone
       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone


@@ -39,7 +40,7 @@ class NodeController < ApplicationController
     new_node = Node.from_xml(request.raw_post)
        
     unless new_node and new_node.id == node.id
     new_node = Node.from_xml(request.raw_post)
        
     unless new_node and new_node.id == node.id

-      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")

     end
     node.update_from(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"
     end
     node.update_from(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"


@@ -53,7 +54,7 @@ class NodeController < ApplicationController
     new_node = Node.from_xml(request.raw_post)
     
     unless new_node and new_node.id == node.id
     new_node = Node.from_xml(request.raw_post)
     
     unless new_node and new_node.id == node.id

-      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")

     end
     node.delete_with_history!(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"
     end
     node.delete_with_history!(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"


@@ -64,7 +65,7 @@ class NodeController < ApplicationController
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0

-      raise OSM::BadUserInput.new("No nodes were given to search for")
+      raise OSM::APIBadUserInput.new("No nodes were given to search for")

     end
     doc = OSM::API.new.get_xml_doc
 
     end
     doc = OSM::API.new.get_xml_doc