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

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

diff --git a/app/models/old_relation_member.rb b/app/models/old_relation_member.rb
index 1714f3c859bc0df5d2af1d6f06bcd1151558db37..c99f60e7c95e97d943f42326bf46c40065d45558 100644 (file)
--- a/app/models/old_relation_member.rb
+++ b/app/models/old_relation_member.rb
@@ -22,7 +22,9 @@ class OldRelationMember < ApplicationRecord
   self.table_name = "relation_members"
   self.primary_keys = "relation_id", "version", "sequence_id"
 
   self.table_name = "relation_members"
   self.primary_keys = "relation_id", "version", "sequence_id"
 

-  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+  belongs_to :old_relation, :foreign_key => [:relation_id, :version], :inverse_of => :old_members

   # A bit messy, referring to the current tables, should do for the data browser for now
   belongs_to :member, :polymorphic => true
   # A bit messy, referring to the current tables, should do for the data browser for now
   belongs_to :member, :polymorphic => true

+
+  validates :member_role, :allow_blank => true, :length => { :maximum => 255 }, :characters => true

 end
 end