Make the polymorphic relation association work properly.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 4393f252679e12cf7a6c606ecd1331ad938228a2..be444bf3e252fee4832ea12e8c31dfa4124d9742 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,8 +1,8 @@
-# The node model represents a current existing node, that is, the latest version. Use OldNode for historical nodes.
-
-class Node < GeoRecord
+class Node < ActiveRecord::Base
   require 'xml/libxml'
 
+  include GeoRecord
+
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -17,8 +17,8 @@ class Node < GeoRecord
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 
-  has_many :containing_relation_members, :as => :member
-  has_many :containing_relations, :through => :containing_relation_members
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position