X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/363155a2a86796d27ee9161f1ee9b74d6fa307e5..ee168fb68b11d9b402e895cb5311b9913b2cd127:/app/controllers/api/old_controller.rb?ds=inline

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 39bb35ca9..ceed10978 100644
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -5,38 +5,36 @@ 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
       # to do that ourselves.
       raise OSM::APINotFoundError if @elements.empty?
 
-      visible_elements = if show_redactions?
-                           @elements
-                         else
-                           @elements.unredacted
-                         end
-
-      @elems = []
-
-      visible_elements.each do |element|
-        @elems << element
-      end
+      # determine visible elements
+      @elems = if show_redactions?
+                 @elements
+               else
+                 @elements.unredacted
+               end
 
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
 
@@ -47,11 +45,10 @@ module Api
       else
         response.last_modified = @old_element.timestamp
 
-        @elems = [@old_element]
-
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       end
     end