X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1ecf13d8461b2b0c597ba8b6492f6ffd973c61a0..c382f33e1c2e17ba00898dede1ff9c3605818f16:/app/models/segment.rb diff --git a/app/models/segment.rb b/app/models/segment.rb index a88bc9a5b..cf0ec2061 100644 --- 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_name => 'Node', :foreign_key => 'node_a' - has_one :to_node, :class_name => '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,7 +104,7 @@ class Segment < ActiveRecord::Base end end - def precondtions_ok? + def preconditions_ok? from_node and from_node.visible and to_node and to_node.visible end