X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/53aa7259bb0612eb48a17d0b954ad71ea37d87a4..ef6803416be6a3be43162f18ed5128cebc4c6033:/app/models/old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 29edb90ad..c36d64572 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -31,13 +31,13 @@ class OldRelation < ApplicationRecord
   include Redactable
 
   belongs_to :changeset
-  belongs_to :redaction
-  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
+  belongs_to :redaction, :optional => true
+  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations
 
-  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version]
-  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version]
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
+  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
 
-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
@@ -99,7 +99,7 @@ class OldRelation < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
-  def is_latest_version?
+  def latest_version?
     current_relation.version == version
   end
 end