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

[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 bf3fcdb39ee1a725f814cefa25d17727eb52b4bd..f8e42476f878c11aaa6aac42f81b5f5ddf7d5536 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -16,23 +16,25 @@ 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?
 
-      visible_elements = if show_redactions?
-                           @elements
-                         else
-                           @elements.unredacted
-                         end
-
-      @elems = visible_elements
+      # 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
 
@@ -46,6 +48,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       end
     end