X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9189093997610a8f289037d37b683c9fed060ae1..1ecf13d8461b2b0c597ba8b6492f6ffd973c61a0:/app/models/segment.rb diff --git a/app/models/segment.rb b/app/models/segment.rb index 774517e2c..a88bc9a5b 100644 --- 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_one :from_node, :class => 'Node', :foreign_key => 'node_a' - has_one :to_node, :class => 'Node', :foreign_key => 'node_b' + has_one :from_node, :class_name => 'Node', :foreign_key => 'node_a' + has_one :to_node, :class_name => 'Node', :foreign_key => 'node_b' def self.from_xml(xml, create=false) p = XML::Parser.new @@ -104,7 +104,7 @@ class Segment < ActiveRecord::Base end def precondtions_ok? - return from_node and from_node.visible and to_node and to_node.visible + from_node and from_node.visible and to_node and to_node.visible end end