X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bb07e29ec7c178757f3c94eea84935a554d812d..3666b674330ec8d14a224932a191d6121c5974e2:/app/controllers/api/old_controller.rb diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb index 9d9f2fabc..f8e42476f 100644 --- a/app/controllers/api/old_controller.rb +++ b/app/controllers/api/old_controller.rb @@ -6,7 +6,6 @@ module Api require "xml/libxml" before_action :setup_user_auth, :only => [:history, :version] - before_action :api_deny_access_handler before_action :authorize, :only => [:redact] authorize_resource @@ -17,25 +16,26 @@ module Api 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 # to do that ourselves. raise OSM::APINotFoundError if @elements.empty? - doc = OSM::API.new.get_xml_doc - - visible_elements = if show_redactions? - @elements - else - @elements.unredacted - end - - visible_elements.each do |element| - doc.root << element.to_xml_node + # determine visible elements + @elems = if show_redactions? + @elements + else + @elements.unredacted + end + + # Render the result + respond_to do |format| + format.xml + format.json end - - render :xml => doc.to_s end def version @@ -45,10 +45,11 @@ module Api else response.last_modified = @old_element.timestamp - doc = OSM::API.new.get_xml_doc - doc.root << @old_element.to_xml_node - - render :xml => doc.to_s + # Render the result + respond_to do |format| + format.xml + format.json + end end end