Merge remote-tracking branch 'upstream/pull/4631'

[rails.git] / app / controllers / api / old_controller.rb

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 862d14716f9b12e34c25e6629ada8d1b7e16b8e2..5b16b453d6f92f1acbb65064c49ce2201325f2a4 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -3,19 +3,19 @@
 # nodes, ways and relations are basically identical.
 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
@@ -30,10 +30,13 @@ module Api
                end
 
       # Render the result
-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
 
-    def version
+    def show
       if @old_element.redacted? && !show_redactions?
         head :forbidden
 
@@ -41,7 +44,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