Fix some incorrect tests that relied on the default routes

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 389e2ce5234cded24bba7548a567e6b7b9dee124..aba38511ce5e01399bb702a9ef3115b295cd95fa 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,26 +1,7 @@
 class RelationMember < ActiveRecord::Base
 class RelationMember < ActiveRecord::Base

-  set_table_name 'current_relation_members'  
-  set_primary_keys :relation_id, :sequence_id
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"

 
   belongs_to :relation
   belongs_to :member, :polymorphic => true
 
   belongs_to :relation
   belongs_to :member, :polymorphic => true

-
-  after_find :set_class_from_type
-  after_initialize :set_class_from_type
-  before_save :set_type_from_class
-
-  def member_type=(type)
-    self[:member_type] = type
-    self[:member_class] = type.capitalize
-  end
-
-private
-
-  def set_class_from_type
-    self[:member_class] = self.member_type.classify unless self.member_type.nil?
-  end
-
-  def set_type_from_class
-    self.member_type = self[:member_class].classify
-  end

 end
 end