X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11cc4a5e601dd288d601e6e35a72d159062f18b5..cbf6b394644e5eff071ecab3cae3f17842fd3631:/app/controllers/api/old_controller.rb diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb index 49fdcf1a3..7c9c32e63 100644 --- a/app/controllers/api/old_controller.rb +++ b/app/controllers/api/old_controller.rb @@ -5,17 +5,19 @@ module Api class OldController < ApiController require "xml/libxml" - before_action :setup_user_auth, :only => [:history, :version] + before_action :check_api_readable + before_action :check_api_writable, :only => [:redact] + before_action :setup_user_auth, :only => [:history, :show] before_action :authorize, :only => [:redact] authorize_resource - 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] + before_action :set_request_formats, :except => [:redact] + 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 @@ -32,10 +34,11 @@ module Api # Render the result respond_to do |format| format.xml + format.json end end - def version + def show if @old_element.redacted? && !show_redactions? head :forbidden @@ -45,6 +48,7 @@ module Api # Render the result respond_to do |format| format.xml + format.json end end end