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

[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..ceed10978d9b614dbab6fa16298189ee9b5565ea 100644 (file)
--- 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"
 
   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 :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]
 
     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
     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
                end
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     def version
     end
 
     def version


@@ -41,7 +46,10 @@ module Api
         response.last_modified = @old_element.timestamp
 
         # Render the result
         response.last_modified = @old_element.timestamp
 
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       end
     end
 
       end
     end