undo composite keys change on old_ndoe

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 3f5f661970edaad4a6d5ae56118abb565a839de1..d3a1b039f557b2afc129f050106b5282db23b897 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -15,7 +15,7 @@ class WayController < ApplicationController
         if !way.preconditions_ok?
           render :text => "", :status => :precondition_failed
         else
-         way.version = 0
+          way.version = 0
           way.user_id = @user.id
           way.save_with_history!
 
@@ -49,10 +49,15 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
+      if new_way.version != way.version
+        render :text => "Version mismatch: Provided " + new_way.version.to_s + ", server had: " + way.version.to_s, :status => :bad_request
+        return
+      end  
+        
 
       if new_way and new_way.id == way.id
-       way.update_from(new_way, @user)
-       render :nothing => true
+        way.update_from(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end