X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/controllers/api/old_controller.rb diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb index 862d14716..ceed10978 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 :check_api_readable + before_action :check_api_writable, :only => [:redact] before_action :setup_user_auth, :only => [:history, :version] 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 @@ -30,7 +32,10 @@ module Api end # Render the result - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end end def version @@ -41,7 +46,10 @@ module Api response.last_modified = @old_element.timestamp # Render the result - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end end end