Merge potlatch_010 branch to head.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index d61293e82203c6de2d0ce11b8350c67a4895114d..cac6111637a57eeadc4d44a8e19d143fad6a4875 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -17,13 +17,15 @@ class Node < ActiveRecord::Base
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 
-  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :old_way_nodes
+  has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
-  # Atomic undelete support
   has_many :old_way_nodes
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?