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

be a bit more specific when a way is a member of a relation. Actually return an error message when a relation precondition fails. Remove a debug statement.

Browse source
This commit is contained in:
Shaun McDonald 2009-05-05 17:07:06 +00:00
parent 8696d144ad
commit d0e16cdb6c
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/models/way.rb
View file

@ -251,18 +251,17 @@ class Way < ActiveRecord::Base
# shouldn't be possible to get race conditions.
Way.transaction do
check_consistency(self, new_way, user)
if RelationMember.find(:first, :joins => :relation,
rel = RelationMember.find(:first, :joins => :relation,
:conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of a relation.")
else
self.changeset_id = new_way.changeset_id
self.changeset = new_way.changeset
raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of the relation with id #{rel.id}.") if rel
self.changeset_id = new_way.changeset_id
self.changeset = new_way.changeset
self.tags = []
self.nds = []
self.visible = false
save_with_history!
end
self.tags = []
self.nds = []
self.visible = false
save_with_history!
end
end