Move the admin actions into line with the other links

[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 ba0dd0c6bb99ae870211f19568b3ad8445dc434c..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 :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
 

-      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


@@ -26,7 +28,10 @@ module Api
       response.last_modified = @relation.timestamp
       if @relation.visible
         # Render the result
       response.last_modified = @relation.timestamp
       if @relation.visible
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -117,7 +122,10 @@ module Api
         @relations << relation
 
         # Render the result
         @relations << relation
 
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -133,7 +141,10 @@ module Api
       @relations = Relation.find(ids)
 
       # Render the result
       @relations = Relation.find(ids)
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     def relations_for_way
     end
 
     def relations_for_way


@@ -160,7 +171,10 @@ module Api
       end
 
       # Render the result
       end
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end