API 0.4 Updates - work on traces pages + pagination, edit tab, some API testing

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 774517e2cbc650b4157df2cc6b13f653bd601a48..cf0ec206140c19f6ada667d513906faa1ddceec1 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -8,8 +8,9 @@ class Segment < ActiveRecord::Base
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
 
-  has_one :from_node, :class => 'Node', :foreign_key => 'node_a'
-  has_one :to_node, :class => 'Node', :foreign_key => 'node_b'
+  # using belongs_to :foreign_key = 'node_*', since if use has_one :foreign_key = 'id', segment preconditions? fails checking for segment id in node table
+  belongs_to :from_node, :class_name => 'Node', :foreign_key => 'node_a'
+  belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b'
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
@@ -103,8 +104,8 @@ class Segment < ActiveRecord::Base
     end
   end
 
-  def precondtions_ok?
-    return from_node and from_node.visible and to_node and to_node.visible
+  def preconditions_ok?
+    from_node and from_node.visible and to_node and to_node.visible
   end
 
 end