Update list of filtered methods in notes controller

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 9e2c5a40ef3830cbcd50b10ab1d81bf7ed2e4923..c2ec43c9c0431d40357c80803486d71ed87a1799 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -45,13 +45,15 @@ class OldNode < ActiveRecord::Base
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s
-    unless self.redacted? and (@user.nil? or not @user.moderator?)
-      self.tags.each do |k,v|
-        el2 = XML::Node.new('tag')
-        el2['k'] = k.to_s
-        el2['v'] = v.to_s
-        el1 << el2
-      end
+
+    self.tags.each do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end
+
+    if self.visible?
       el1['lat'] = self.lat.to_s
       el1['lon'] = self.lon.to_s
     end
@@ -62,14 +64,12 @@ class OldNode < ActiveRecord::Base
       el1['uid'] = self.changeset.user.id.to_s
     end
 
-    
-
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['version'] = self.version.to_s
-    if self.redacted?
-      el1['redacted'] = self.redaction.title
-    end
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
+
     return el1
   end