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

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 7c399c3a88936b1769bb1657cf23c3db232d9e92..2b72cd2b182595bd6f6abb2d138559c700572103 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -17,10 +17,11 @@
 #  current_relation_members_id_fkey  (relation_id => current_relations.id)
 #
 
-class RelationMember < ActiveRecord::Base
+class RelationMember < ApplicationRecord
   self.table_name = "current_relation_members"
-  self.primary_keys = "relation_id", "sequence_id"
 
-  belongs_to :relation, :foreign_key => :relation_id
+  belongs_to :relation
   belongs_to :member, :polymorphic => true
+
+  validates :member_role, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
 end