List all objects that are blocking a delete, in a well defined order

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index badcd74a2cb7d9d1975e9306559c56fb9fbd3e60..397e836184f1f7d36c906852dcc732a9c4fbec5e 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -4,15 +4,20 @@ class OldNode < ActiveRecord::Base
 
   set_table_name 'nodes'
   
+  # Should probably have the composite primary key set in the model
+  # however there are some weird bugs happening when you do
+  #set_primary_keys :id, :version
+  
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
+  validates_associated :changeset
 
   belongs_to :changeset
  
   def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?
   end
 
   def self.from_node(node)