Set server_url to test.host in test environments

[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 41f4e325afa8c21db018946b257775b312755d12..ba0dd0c6bb99ae870211f19568b3ad8445dc434c 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -22,15 +22,11 @@ module Api
     end
 
     def show
-      relation = Relation.find(params[:id])
-      response.last_modified = relation.timestamp
-      if relation.visible
-        @relation = relation
-
+      @relation = Relation.find(params[:id])
+      response.last_modified = @relation.timestamp
+      if @relation.visible
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render :formats => [:xml]
       else
         head :gone
       end
@@ -121,9 +117,7 @@ module Api
         @relations << relation
 
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render :formats => [:xml]
       else
         head :gone
       end
@@ -139,9 +133,7 @@ module Api
       @relations = Relation.find(ids)
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render :formats => [:xml]
     end
 
     def relations_for_way
@@ -168,9 +160,7 @@ module Api
       end
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render :formats => [:xml]
     end
   end
 end