Merge branch 'master' into notes

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index fbaf89dafd937d30871f30fed7c3bb5ab87e1d20..aba38511ce5e01399bb702a9ef3115b295cd95fa 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,24 +1,7 @@
 class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'
-  
-  set_primary_keys :id, :sequence_id
-  belongs_to :member, :polymorphic => true
-  belongs_to :relation, :foreign_key => :id
-
-  def after_find
-    self[:member_class] = self.member_type.classify
-  end
-
-  def after_initialize
-    self[:member_class] = self.member_type.classify unless self.member_type.nil?
-  end
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"
 
-  def before_save
-    self.member_type = self[:member_class].classify
-  end
-
-  def member_type=(type)
-    self[:member_type] = type
-    self[:member_class] = type.capitalize
-  end
+  belongs_to :relation
+  belongs_to :member, :polymorphic => true
 end