X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67dd9e4c9d487bdb5f38a09dc0c99def4989326e..dee70e8daae82961ceda602a0646c4828a996965:/app/models/old_relation.rb diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index e4be8fc7f..390c142db 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -1,10 +1,13 @@ class OldRelation < ActiveRecord::Base include ConsistencyValidations - include Redactable self.table_name = "relations" self.primary_keys = "relation_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_relation, :class_name => "Relation", :foreign_key => "relation_id" @@ -102,6 +105,8 @@ class OldRelation < ActiveRecord::Base el1['version'] = self.version.to_s el1['changeset'] = self.changeset_id.to_s + el1['redacted'] = self.redaction.id.to_s if self.redacted? + self.old_members.each do |member| e = XML::Node.new 'member' e['type'] = member.member_type.to_s.downcase @@ -109,13 +114,14 @@ class OldRelation < ActiveRecord::Base 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 end + return el1 end