]> git.openstreetmap.org Git - rails.git/commitdiff
Fix grammar/referred relation id in precondition failed error.
authorThomas Wood <grand.edgemaster@gmail.com>
Thu, 30 Apr 2009 06:52:14 +0000 (06:52 +0000)
committerThomas Wood <grand.edgemaster@gmail.com>
Thu, 30 Apr 2009 06:52:14 +0000 (06:52 +0000)
From: "Precondition failed: The relation 5 is a used in relation 4,0."
To: "Precondition failed: The relation 5 is used in relation 4."

app/models/relation.rb

index 08b77f4496757f16805b6b77dcb6521695fce740..ae9d2f8446de5ff55cd3a09bb23c3a71df649cad 100644 (file)
@@ -243,7 +243,7 @@ class Relation < ActiveRecord::Base
       check_consistency(self, new_relation, user)
       # This will check to see if this relation is used by another relation
       rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
-      raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is a used in relation #{rel.id}.") unless rel.nil?
+      raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is used in relation #{rel.relation.id}.") unless rel.nil?
 
       self.changeset_id = new_relation.changeset_id
       self.tags = {}