prevent update of any object without providing the correct/current

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index fd01008fa511778aaf1e503a32ee6898c4df782b..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
         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!
 
           way.user_id = @user.id
           way.save_with_history!
 


@@ -49,37 +49,25 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
     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
 
       if new_way and new_way.id == way.id

-        unless update_internal(way, new_way)
-          render :text => "", :status => :precondition_failed
-        else
-          render :nothing => true
-        end
+        way.update_from(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"

       else
         render :nothing => true, :status => :bad_request
       end
       else
         render :nothing => true, :status => :bad_request
       end

+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed

     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 

-  def update_internal way, new_way
-    way = Way.find(new_way.id) if way.nil?
-
-    if !new_way.preconditions_ok?
-      return false
-    else
-      way.user_id = @user.id
-      way.tags = new_way.tags
-      way.nds = new_way.nds
-      way.visible = true
-      way.save_with_history!
-
-      return true
-    end
-  end
-

   # This is the API call to delete a way
   def delete
     begin
   # This is the API call to delete a way
   def delete
     begin