X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cd7af7e0b2ad97687849576ed4e3f52c37a6d55..4492118dbc2f65b8628a45d16e7e49fa6a3c7b13:/app/models/old_node.rb?ds=sidebyside diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 3261c9a0e..077039ac3 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -35,7 +35,7 @@ class OldNode < ApplicationRecord # the queries generated by Redactable will use the wrong table name. include Redactable - validates :changeset, :presence => true, :associated => true + validates :changeset, :associated => true validates :latitude, :presence => true, :numericality => { :only_integer => true } validates :longitude, :presence => true, @@ -47,9 +47,9 @@ class OldNode < ApplicationRecord belongs_to :changeset belongs_to :redaction, :optional => true - belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id" + belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes - has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version] + has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world? @@ -103,7 +103,7 @@ class OldNode < 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_node.version == version end end