From: Tom Hughes <tom@compton.nu>
Date: Fri, 22 Jun 2007 15:37:57 +0000 (+0000)
Subject: Correctly record which user deleted an object.
X-Git-Tag: live~8343
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0c198107afc7c7132978276ce608da092b0113e7?ds=sidebyside

Correctly record which user deleted an object.
---

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index f2a3ce329..6815470b8 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -58,6 +58,7 @@ class NodeController < ApplicationController
         if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
           render :nothing => true, :status => HTTP_PRECONDITION_FAILED
         else
+          node.user_id = @user.id
           node.visible = 0
           node.save_with_history
           render :nothing => true
diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 5ef11084c..bc41b85a3 100644
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -60,6 +60,7 @@ class SegmentController < ApplicationController
         if WaySegment.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_segments.id", :conditions => [ "current_ways.visible = 1 AND current_way_segments.segment_id = ?", segment.id ])
           render :nothing => true, :status => HTTP_PRECONDITION_FAILED
         else
+          segment.user_id = @user.id
           segment.visible = 0
           segment.save_with_history
           render :nothing => true
diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index e7eead52f..dca9241a6 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -87,6 +87,7 @@ class WayController < ApplicationController
 
     when :delete
       if way.visible
+        way.user_id = @user.id
         way.visible = false
         way.save_with_history
         render :nothing => true