fixing the data browser to be able to cope with the changeset change. changeset brows...

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index d87905059ea37c8c791266fe0305de5a45c109bc..b77d41ead34abbdefdfbf44c546196d1c3ff8dda 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -68,7 +68,13 @@ class RelationController < ApplicationController
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])

-      relation.delete_with_history(@user)
+      new_relation = Relation.from_xml(request.raw_post)
+      if new_relation and new_relation.id == relation.id
+        relation.delete_with_history(new_relation, @user)
+        render :nothing => true, :status => :success
+      else
+        render :nothing => true, :status => :bad_request
+      end

     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound