Fixed redaction attribute on old nodes and ways, added same

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 30bc12cc22f0821881032706daab3f250217f92b..e99f6cf28b31fb6a25e61e78df75dcc49ab32287 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -105,7 +105,7 @@ class OldWay < ActiveRecord::Base
     el1['changeset'] = self.changeset.id.to_s
 
     if self.redacted?
-      el1['redacted'] = self.redaction.title
+      el1['redacted'] = self.redaction.id.to_s
     end
     
     unless self.redacted? and (@user.nil? or not @user.moderator?)
@@ -146,7 +146,7 @@ class OldWay < ActiveRecord::Base
   def get_nodes_revert(timestamp)
     points=[]
     self.nds.each do |n|
-      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).order("timestamp DESC").first
+      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.order("timestamp DESC").first
       curnode = Node.find(n)
       id = n; reuse = curnode.visible
       if oldnode.lat != curnode.lat or oldnode.lon != curnode.lon or oldnode.tags != curnode.tags then