Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index f3033d1c641494225b15dc77ac108ee623866249..fbaf89dafd937d30871f30fed7c3bb5ab87e1d20 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -2,19 +2,19 @@ class RelationMember < ActiveRecord::Base
   set_table_name 'current_relation_members'
   
   set_primary_keys :id, :sequence_id
   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
   belongs_to :relation, :foreign_key => :id
 
   def after_find

-    self[:member_class] = self.member_type.capitalize
+    self[:member_class] = self.member_type.classify

   end
 
   def after_initialize
   end
 
   def after_initialize

-    self[:member_class] = self.member_type.capitalize unless self.member_type.nil?
+    self[:member_class] = self.member_type.classify unless self.member_type.nil?

   end
 
   def before_save
   end
 
   def before_save

-    self.member_type = self[:member_class].downcase
+    self.member_type = self[:member_class].classify

   end
 
   def member_type=(type)
   end
 
   def member_type=(type)