Localisation updates from https://translatewiki.net.

[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 28e4a026bc47a820a5eb40faa7aa1c221e6364f6..5dd5632ba89aff98187c763b654b9c5efdfe9eb3 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -2,13 +2,13 @@ module Api
   class RelationsController < ApiController
     require "xml/libxml"
 
   class RelationsController < ApiController
     require "xml/libxml"
 

+    before_action :check_api_writable, :only => [:create, :update, :delete]
+    before_action :check_api_readable, :except => [:create, :update, :delete]

     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]

-    before_action :check_api_writable, :only => [:create, :update, :delete]
-    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]
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :set_request_formats, :except => [:create, :update, :delete]


@@ -16,7 +16,7 @@ module Api
     def create
       assert_method :put
 
     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
 
       # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
       relation.create_with_history current_user