Rensselaer Center for Open Source Software

Fixed redaction attribute on old nodes and ways, added same

6 files changed, 20 lines added, 13 lines removed

functionality to relations.

Changes

--- app/models/old_node.rb ecf767ee4f342f5aa2e1f032771983a8e4ba8c11
+++ app/models/old_node.rb 59280377bf40b900a2d340474dd94dcec5abea3f
@@ -68,7 +68,7 @@
-      el1['redacted'] = self.redaction.title
+      el1['redacted'] = self.redaction.id.to_s
--- app/models/old_relation.rb ecf767ee4f342f5aa2e1f032771983a8e4ba8c11
+++ app/models/old_relation.rb 59280377bf40b900a2d340474dd94dcec5abea3f
@@ -105,20 +105,27 @@
-    self.old_members.each do |member|
-      e = XML::Node.new 'member'
-      e['type'] = member.member_type.to_s.downcase
-      e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
-      e['role'] = member.member_role.to_s
-      el1 << e
+    if self.redacted?
+      el1['redacted'] = self.redaction.id.to_s
+    
+    unless self.redacted? and (@user.nil? or not @user.moderator?)
+      self.old_members.each do |member|
+        e = XML::Node.new 'member'
+        e['type'] = member.member_type.to_s.downcase
+        e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
+        e['role'] = member.member_role.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
+      self.old_tags.each do |tag|
+        e = XML::Node.new 'tag'
+        e['k'] = tag.k
+        e['v'] = tag.v
+        el1 << e
+      end
+
--- app/models/old_way.rb ecf767ee4f342f5aa2e1f032771983a8e4ba8c11
+++ app/models/old_way.rb 59280377bf40b900a2d340474dd94dcec5abea3f
@@ -105,7 +105,7 @@
-      el1['redacted'] = self.redaction.title
+      el1['redacted'] = self.redaction.id.to_s
Matt Amos
Jumpstart • 62 weeks ago