X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cd7af7e0b2ad97687849576ed4e3f52c37a6d55..1b6cf67067b6c723527190804c9cd572828b4adb:/app/models/old_relation.rb?ds=inline diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index e948cae5e..c36d64572 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -32,12 +32,12 @@ class OldRelation < ApplicationRecord belongs_to :changeset belongs_to :redaction, :optional => true - belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" + 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