X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f8ab9e9244550b20b8d3bd97b3567df7020d06d..f8ace8f9e063861d66558f43b936c92ae85a0e96:/app/models/relation_member.rb

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 9ff4f46f3..82cb4cc8d 100644
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,23 +1,27 @@
 class RelationMember < ActiveRecord::Base
   set_table_name 'current_relation_members'
   
-  belongs_to :member, :polymorphic => true, :foreign_type => :member_class
+  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.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