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 3df0c2d4f3b53bc99c0c27e4c276227e59a5d582..e99f6cf28b31fb6a25e61e78df75dcc49ab32287 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,10 +1,13 @@
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
-  include Redactable
 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"
 
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
   belongs_to :changeset
   belongs_to :redaction
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
@@ -100,18 +103,26 @@ class OldWay < ActiveRecord::Base
     end
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset.id.to_s
-    
-    self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
-      e = XML::Node.new 'nd'
-      e['ref'] = nd.node_id.to_s
-      el1 << e
+
+    if self.redacted?
+      el1['redacted'] = self.redaction.id.to_s
     end
- 
-    self.old_tags.each do |tag|
-      e = XML::Node.new 'tag'
-      e['k'] = tag.k
-      e['v'] = tag.v
-      el1 << e
+    
+    unless self.redacted? and (@user.nil? or not @user.moderator?)
+      # If a way is redacted and the user isn't a moderator, only show
+      # meta-data from this revision, but no real data.
+      self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+        e = XML::Node.new 'nd'
+        e['ref'] = nd.node_id.to_s
+        el1 << e
+      end
+      
+      self.old_tags.each do |tag|
+        e = XML::Node.new 'tag'
+        e['k'] = tag.k
+        e['v'] = tag.v
+        el1 << e
+      end
     end
     return el1
   end
@@ -135,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