api06: s/delete_with_relations_and_history/delete_with_history/g

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 9994a6b1e6c989be5968b0157fe263a0ca500921..db3a2629512b0251d0c645d751914be380675dc4 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -167,7 +167,7 @@ class ChangesetController < ApplicationController
       doc.find('//osm/delete/way').each do |nd|
        elem = XML::Node.new 'way'
        way = Way.find(nd['id'])
-       way.delete_with_relations_and_history(@user)
+       way.delete_with_history(@user)
        elem['old_id'] = elem['new_id'] = way.id.to_s
        elem['new_version'] = way.version.to_s
        root << elem

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index b22d35d0bfdb393f9bd7d5a854d181b1646bf761..21f2ea76567cc639f669724232e904b510a7a53e 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -70,7 +70,7 @@ class WayController < ApplicationController
   def delete
     begin
       way = Way.find(params[:id])
-      way.delete_with_relations_and_history(@user)
+      way.delete_with_history(@user)
 
       # if we get here, all is fine, otherwise something will catch below.  
       render :nothing => true

diff --git a/app/models/way.rb b/app/models/way.rb
index a6192e2d735e7ce128096a84cd32780da23db9d2..ea027fb47908d2148ae7d07476843972aeeebd86 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -221,8 +221,7 @@ class Way < ActiveRecord::Base
     return true
   end
 
-  # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
-  def delete_with_relations_and_history(user)
+  def delete_with_history(user)
     if self.visible
          # FIXME
          # this should actually delete the relations,
@@ -246,6 +245,8 @@ class Way < ActiveRecord::Base
   end
 
   # delete a way and it's 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)
     
     node_ids = self.nodes.collect {|node| node.id }
@@ -266,7 +267,7 @@ class Way < ActiveRecord::Base
     
     self.user_id = user.id
 
-    self.delete_with_relations_and_history(user)
+    self.delete_with_history(user)
 
   end
 end