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

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

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 2f2cb8503217970f21ede6477e7ae9cca08524a3..28e4a026bc47a820a5eb40faa7aa1c221e6364f6 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -11,6 +11,8 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 

+    before_action :set_request_formats, :except => [:create, :update, :delete]
+

     def create
       assert_method :put
 
     def create
       assert_method :put
 


@@ -28,6 +30,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
         # Render the result
         respond_to do |format|
           format.xml

+          format.json

         end
       else
         head :gone
         end
       else
         head :gone


@@ -121,6 +124,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
         # Render the result
         respond_to do |format|
           format.xml

+          format.json

         end
       else
         head :gone
         end
       else
         head :gone


@@ -139,6 +143,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
       # Render the result
       respond_to do |format|
         format.xml

+        format.json

       end
     end
 
       end
     end
 


@@ -168,6 +173,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
       # Render the result
       respond_to do |format|
         format.xml

+        format.json

       end
     end
   end
       end
     end
   end