One final (I've checked the rest now!) mis-referenced id, plus make the error msg...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 1480361e0b4937140cb0f3feb8ad8233db2d5eae..16c93f608b5ddc3d93b77cdbe419354244194539 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -253,7 +253,7 @@ class Way < ActiveRecord::Base
       check_consistency(self, new_way, user)
       rel = RelationMember.find(:first, :joins => :relation,
                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
       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("You need to make sure that the way with id: #{self.id} is not a member of the relation with id #{rel.id}.") if rel
+      raise OSM::APIPreconditionFailedError.new("Way #{self.id} still used by relation #{rel.relation.id}.") if rel

       
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
       
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset