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

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 81d8e331fcf5e1fc507e5a19119cfc5773e9ab5f..979f7cb6b25edcbd8fcf6174071b639c2f9f5980 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"
 
   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version]
@@ -82,7 +82,7 @@ class OldNode < ApplicationRecord
   end
 
   def tags
-    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :tags