Update validates_email_format_of plugin

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 08bb988eec243117165e6e58de560558287ebbbf..82cb4cc8d288669fdb82ceca90febdaf41375b30 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -2,23 +2,26 @@ class RelationMember < ActiveRecord::Base
   set_table_name 'current_relation_members'
   
   set_primary_keys :id, :sequence_id
-  belongs_to :member, :polymorphic => true, :foreign_type => :member_class
+
+  belongs_to :member, :polymorphic => true
   belongs_to :relation, :foreign_key => :id
 
-  def after_find
-    self[:member_class] = self.member_type.capitalize
-  end
+  after_find :set_class_from_type
+  after_initialize :set_class_from_type
+  before_save :set_type_from_class
 
-  def after_initialize
-    self[:member_class] = self.member_type.capitalize
+  def member_type=(type)
+    self[:member_type] = type
+    self[:member_class] = type.capitalize
   end
 
-  def before_save
-    self.member_type = self[:member_class].downcase
+private
+
+  def set_class_from_type
+    self[:member_class] = self.member_type.classify unless self.member_type.nil?
   end
 
-  def member_type=(type)
-    self[:member_type] = type
-    self[:member_class] = type.capitalize
+  def set_type_from_class
+    self.member_type = self[:member_class].classify
   end
 end