Fixed precondition typo and segment_controller foreign key

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index a88bc9a5b62f47e6277366a37e89adfdf3379956..785701c3d5d61761d536a0222d42cd61da768fcc 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -8,8 +8,8 @@ class Segment < ActiveRecord::Base
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
 
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
 

-  has_one :from_node, :class_name => 'Node', :foreign_key => 'node_a'
-  has_one :to_node, :class_name => 'Node', :foreign_key => 'node_b'
+  has_one :from_node, :class_name => 'Node', :foreign_key => 'id'
+  has_one :to_node, :class_name => 'Node', :foreign_key => 'id'

 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new


@@ -103,7 +103,7 @@ class Segment < ActiveRecord::Base
     end
   end
 
     end
   end
 

-  def precondtions_ok?
+  def preconditions_ok?

     from_node and from_node.visible and to_node and to_node.visible
   end
 
     from_node and from_node.visible and to_node and to_node.visible
   end