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

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

diff --git a/app/controllers/api/old_elements_controller.rb b/app/controllers/api/old_elements_controller.rb
index 2343252dbb0a63243ece6e1c90c9de0875dfee4c..bdbc5e392e21dd00409b5f93dc3494e00f7de334 100644 (file)
--- a/app/controllers/api/old_elements_controller.rb
+++ b/app/controllers/api/old_elements_controller.rb
@@ -4,18 +4,17 @@
 module Api
   class OldElementsController < ApiController
     before_action :check_api_writable, :only => [:redact]
 module Api
   class OldElementsController < ApiController
     before_action :check_api_writable, :only => [:redact]

-    before_action :setup_user_auth, :only => [:history, :show]
+    before_action :setup_user_auth, :only => [:index, :show]

     before_action :authorize, :only => [:redact]
 
     authorize_resource
 
     before_action :authorize, :only => [:redact]
 
     authorize_resource
 

-    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 :lookup_old_element, :except => [:index]
+    before_action :lookup_old_element_versions, :only => [:index]

 
     before_action :set_request_formats, :except => [:redact]
 
 
     before_action :set_request_formats, :except => [:redact]
 

-    def history
+    def index

       # 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.
       # 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.