Merge remote-tracking branch 'upstream/pull/4226'

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 1324c8139bc933bd05589fadc91ba883c8a3270a..077039ac33c2e13c5e0e8f702f1d0d520e2fbd9c 100644 (file)
--- 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,
@@ -46,7 +46,7 @@ class OldNode < ApplicationRecord
   validate :validate_position
 
   belongs_to :changeset
-  belongs_to :redaction
+  belongs_to :redaction, :optional => true
   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], :inverse_of => :old_node
@@ -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