Fix new rubocop warnings

[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..9bb3eb87c4ebf4e2f2c4404a30981957b859a70d 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -11,10 +11,12 @@ module Api
     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
 
-      relation = Relation.from_xml(request.raw_post, true)
+      relation = Relation.from_xml(request.raw_post, :create => true)
 
       # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
       relation.create_with_history current_user
@@ -28,6 +30,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -121,6 +124,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -139,6 +143,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
 
@@ -168,6 +173,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end