X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86b4d1bc2c05a68053c7485217144a7fcf8ef4e8..36203ebe261d38bab5a17ac866c6ed384d70e978:/app/controllers/node_controller.rb?ds=sidebyside diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 379ee77c9..1e0deb140 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -56,7 +56,7 @@ class NodeController < ApplicationController else render :nothing => true, :status => :bad_request end - rescue OSM::APIVersionMismatchError ex + rescue OSM::APIVersionMismatchError => ex render :text => "Version mismatch: Provided " + ex.provided.to_s + ", server had: " + ex.latest.to_s, :status => :bad_request rescue ActiveRecord::RecordNotFound @@ -72,10 +72,8 @@ class NodeController < ApplicationController node.delete_with_history(@user) rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found - rescue OSM::APIAlreadyDeletedError - render :text => "", :status => :gone - rescue OSM::APIPreconditionFailedError - render :text => "", :status => :precondition_failed + rescue OSM::APIError => ex + render ex.render_opts end end