Actually set the instance var when closing the changeset

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 0159c60b875d791ccb7b690ea12a263d436f78d2..ba27e9d7d6efb179e60446343ada1bb130898185 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -209,7 +209,7 @@ class Relation < ActiveRecord::Base
 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.
-    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+    raise OSM::APIDuplicateTagsError.new("relation", self.id, k) if @tags.include? k
 
     @tags[k] = v
   end
@@ -347,7 +347,14 @@ class Relation < ActiveRecord::Base
   end    
 
   def delete_with_history!(new_relation, user)
-    if self.visible
+    unless self.visible
+      raise OSM::APIAlreadyDeletedError.new
+    end
+
+    # need to start the transaction here, so that the database can 
+    # provide repeatable reads for the used-by checks. this means it
+    # shouldn't be possible to get race conditions.
+    Relation.transaction do
       check_consistency(self, new_relation, user)
       # This will check to see if this relation is used by another relation
       if 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 ])
@@ -358,8 +365,6 @@ class Relation < ActiveRecord::Base
       self.members = []
       self.visible = false
       save_with_history!
-    else
-      raise OSM::APIAlreadyDeletedError.new
     end
   end