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

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 03c281e5a437c40f8f4aef0a8b5bcfaaf16bcdf2..acf88ddcf61bc61fab89f925a40be62f7c48509f 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -32,12 +32,12 @@ class OldWay < ApplicationRecord
 
   belongs_to :changeset
   belongs_to :redaction, :optional => true
-  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
 
-  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]
-  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
+  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
 
-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]