Update to iD v1.7.2

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8c57ad8f93d76e8f5ad515c6adc8a56103adf9f0..a077916ea1dc666edd90f6a56ab5897a19ede487 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -3,14 +3,13 @@
 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 :check_api_writable, :only => [:create, :update, :delete]
-  before_filter :check_api_readable, :except => [:create, :update, :delete]
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  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

 
   # Create a node from XML.
   def create
 
   # Create a node from XML.
   def create


@@ -44,6 +43,7 @@ class NodeController < ApplicationController
     unless new_node && new_node.id == node.id
       fail OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
     unless new_node && new_node.id == node.id
       fail 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"
   end