Rename api element version action to show

[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 f672e7c4960d9c66c1d0e94c9dd2eac272c53a0e..7c9c32e639a12602ee6678bcf800fdbbf5f1cb1c 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -5,18 +5,18 @@ module Api
   class OldController < ApiController
     require "xml/libxml"
 
   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 :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_default_request_format, :except => [:redact]
+    before_action :set_request_formats, :except => [:redact]

 
     def history
       # the .where() method used in the lookup_old_element_versions
 
     def history
       # the .where() method used in the lookup_old_element_versions


@@ -38,7 +38,7 @@ module Api
       end
     end
 
       end
     end
 

-    def version
+    def show

       if @old_element.redacted? && !show_redactions?
         head :forbidden
 
       if @old_element.redacted? && !show_redactions?
         head :forbidden