X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..c3ad6aa2923c03aeeea0b57033b0a9238d262aa2:/app/controllers/old_controller.rb?ds=sidebyside diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb index 9d7cf2113..4869ae3e1 100644 --- a/app/controllers/old_controller.rb +++ b/app/controllers/old_controller.rb @@ -2,25 +2,24 @@ # into one place. as it turns out, the API methods for historical # nodes, ways and relations are basically identical. class OldController < ApplicationController - require 'xml/libxml' + require "xml/libxml" - skip_before_filter :verify_authenticity_token - before_filter :setup_user_auth, :only => [:history, :version] - before_filter :authorize, :only => [:redact] - before_filter :authorize_moderator, :only => [:redact] - before_filter :require_allow_write_api, :only => [:redact] - before_filter :check_api_readable - before_filter :check_api_writable, :only => [:redact] - after_filter :compress_output - around_filter :api_call_handle_error, :api_call_timeout - before_filter :lookup_old_element, :except => [:history] - before_filter :lookup_old_element_versions, :only => [:history] + skip_before_action :verify_authenticity_token + before_action :setup_user_auth, :only => [:history, :version] + before_action :authorize, :only => [:redact] + before_action :authorize_moderator, :only => [:redact] + before_action :require_allow_write_api, :only => [:redact] + before_action :check_api_readable + before_action :check_api_writable, :only => [:redact] + around_action :api_call_handle_error, :api_call_timeout + before_action :lookup_old_element, :except => [:history] + before_action :lookup_old_element_versions, :only => [:history] def history # the .where() method used in the lookup_old_element_versions # call won't throw an error if no records are found, so we have # to do that ourselves. - fail OSM::APINotFoundError.new if @elements.empty? + raise OSM::APINotFoundError.new if @elements.empty? doc = OSM::API.new.get_xml_doc @@ -52,7 +51,7 @@ class OldController < ApplicationController end def redact - redaction_id = params['redaction'] + redaction_id = params["redaction"] if redaction_id.nil? # if no redaction ID was provided, then this is an unredact # operation.