Update to rails 3.2.9

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index a75dacd0eba9b04d28a4e6e3264bc6ea58877dae..390c142dbc1b940773b8185b8e352f94f6b2dfe0 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -4,7 +4,13 @@ class OldRelation < ActiveRecord::Base
   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"
 
   has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id
   has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
@@ -99,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
@@ -106,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
 
@@ -130,4 +139,10 @@ class OldRelation < ActiveRecord::Base
   def containing_relation_members
     return []
   end
+
+  # check whether this element is the latest version - that is,
+  # has the same version as its "current" counterpart.
+  def is_latest_version?
+    current_relation.version == self.version
+  end
 end