cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed precondition typo and segment_controller foreign key

Browse source
This commit is contained in:
Nick Black 2007-03-12 15:49:11 +00:00
parent c96b5b951c
commit f75401ae29
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/segment_controller.rb
View file

@ -16,7 +16,7 @@ class SegmentController < ApplicationController
segment.from_node = Node.find(segment.node_a.to_i)
segment.to_node = Node.find(segment.node_b.to_i)
unless segment.precondtions_ok? # are the nodes visible?
unless segment.preconditions_ok? # are the nodes visible?
render :nothing => true, :status => 412
end

2
app/controllers/way_controller.rb
View file

@ -10,7 +10,7 @@ class WayController < ApplicationController
if way
way.user_id = @user.id
unless way.precondtions_ok? # are the segments (and their nodes) visible?
unless way.preconditions_ok? # are the segments (and their nodes) visible?
render :nothing => true, :status => 412
return
end

6
app/models/segment.rb
View file

@ -8,8 +8,8 @@ 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'
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
@ -103,7 +103,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