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

Fixed up delete methods on nodes, ways and relations to return the new version number and added some more tests.

Browse source
This commit is contained in:
Matt Amos 2008-10-14 14:27:12 +00:00
parent 2c16177174
commit b56f57ec43
10 changed files with 100 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/node_controller.rb
View file

@ -78,21 +78,17 @@ class NodeController < ApplicationController
end
end
# Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
# FIXME remove all the fricking SQL
# Delete a node. Doesn't actually delete it, but retains its history
# in a wiki-like way. We therefore treat it like an update, so the delete
# method returns the new version number.
def delete
begin
node = Node.find(params[:id])
new_node = Node.from_xml(request.raw_post)
# FIXME we no longer care about the user, (or maybe we want to check
# that the user of the changeset is the same user as is making this
# little change?) we really care about the
# changeset which must be open, and that the version that we have been
# given is the one that is currently stored in the database
if new_node and new_node.id == node.id
node.delete_with_history(new_node, @user)
render :nothing => true
node.delete_with_history!(new_node, @user)
render :text => node.version.to_s, :content_type => "text/plain"
else
render :nothing => true, :status => :bad_request
end