List all objects that are blocking a delete, in a well defined order

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index 8206eecb30e0f1e54ffb5d7cb16f3346f199149b..23475785c88f1ecc069268f6df85dd2e76fd730c 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -268,10 +268,9 @@ class Way < ActiveRecord::Base
     Way.transaction do
       self.lock!
       check_consistency(self, new_way, user)
-      rel = RelationMember.find(:first, :joins => :relation,
-                             :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
-      raise OSM::APIPreconditionFailedError.new("Way #{self.id} still used by relation #{rel.relation.id}.") if rel
-      
+      rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id)
+      raise OSM::APIPreconditionFailedError.new("Way #{self.id} is still used by relations #{rels.collect { |r| r.id }.join(",")}.") unless rels.empty?
+
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset