0.6-friendly Potlatch (work in progress). DO NOT SET POTLATCH_USE_SQL=false as it...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index da7b8d733fbf877867d7e27124b0f75ce6bc66e6..7c29a44b379857574a7327a6b2f458099916bf9a 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -291,22 +291,24 @@ class Way < ActiveRecord::Base
     end
   end
 
-  # delete a way and it's nodes that aren't part of other ways, with history
+  # delete a way and its nodes that aren't part of other ways, with history
 
   # FIXME: merge the potlatch code to delete the relations
-  def delete_with_relations_and_nodes_and_history(user)
+  #        and refactor to use delete_with_history!
+  def delete_with_relations_and_nodes_and_history(changeset_id)
     # delete the nodes not used by other ways
     self.unshared_node_ids.each do |node_id|
       n = Node.find(node_id)
-      n.user_id = user.id
+      n.changeset_id = changeset_id
       n.visible = false
       n.save_with_history!
     end
     
-    # FIXME needs more information passed in so that the changeset can be updated
-    self.user_id = user.id
-
-    self.delete_with_history(user)
+    self.changeset_id = changeset_id
+    self.tags = []
+    self.nds = []
+    self.visible = false
+    self.save_with_history!
   end
 
   # Find nodes that belong to this way only