Rename user#list to user#index

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 25532a95c72c0dc965f0ddeb1757099a7755773f..059fb8d7e5bc32a7dca26128a705b800c4b0c16d 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -35,9 +35,7 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 

-    unless new_relation && new_relation.id == relation.id
-      raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})"
-    end
+    raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id

 
     relation.update_from new_relation, current_user
     render :plain => relation.version.to_s
 
     relation.update_from new_relation, current_user
     render :plain => relation.version.to_s


@@ -123,15 +121,11 @@ class RelationController < ApplicationController
   end
 
   def relations
   end
 
   def relations

-    unless params["relations"]
-      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]"
-    end
+    raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]

 
     ids = params["relations"].split(",").collect(&:to_i)
 
 
     ids = params["relations"].split(",").collect(&:to_i)
 

-    if ids.empty?
-      raise OSM::APIBadUserInput, "No relations were given to search for"
-    end
+    raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?

 
     doc = OSM::API.new.get_xml_doc
 
 
     doc = OSM::API.new.get_xml_doc