Merge remote-tracking branch 'openstreetmap/pull/1004'

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 82cb4cc8d288669fdb82ceca90febdaf41375b30..e5c783f5c68b788e7d5f034970a3a4ebc28acd5e 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,27 +1,7 @@
 class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'
-  
-  set_primary_keys :id, :sequence_id
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"
 
+  belongs_to :relation, :foreign_key => :relation_id
   belongs_to :member, :polymorphic => true
-  belongs_to :relation, :foreign_key => :id
-
-  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