Fixed redaction attribute on old nodes and ways, added same

functionality to relations.
This commit is contained in:
Matt Amos 2012-04-04 17:22:33 +01:00 committed by Tom Hughes
parent ecf767ee4f
commit 59280377bf
3 changed files with 20 additions and 13 deletions

View file

@ -68,7 +68,7 @@ class OldNode < ActiveRecord::Base
el1['timestamp'] = self.timestamp.xmlschema
el1['version'] = self.version.to_s
if self.redacted?
el1['redacted'] = self.redaction.title
el1['redacted'] = self.redaction.id.to_s
end
return el1
end

View file

@ -105,20 +105,27 @@ class OldRelation < ActiveRecord::Base
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
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
end
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
end
return el1
end

View file

@ -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?)