add fixme

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 9152df81671525f3b4f84409b76fb9c75d78cb33..904330900bedabf06f4db54be85fe5b7cd23bd69 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -69,7 +69,7 @@ class ChangesetController < ApplicationController
 
       # check user credentials - only the user who opened a changeset
       # may alter it.
 
       # check user credentials - only the user who opened a changeset
       # may alter it.

-      unless @user.id == changeset.user_id 
+      unless @user.id == cs.user_id 

         raise OSM::APIUserChangesetMismatchError 
       end
 
         raise OSM::APIUserChangesetMismatchError 
       end
 


@@ -132,13 +132,13 @@ class ChangesetController < ApplicationController
       return
     end
 
       return
     end
 

+    changeset = Changeset.find(params[:id])
+

     # access control - only the user who created a changeset may
     # upload to it.
     unless @user.id == changeset.user_id 
       raise OSM::APIUserChangesetMismatchError 
     end
     # access control - only the user who created a changeset may
     # upload to it.
     unless @user.id == changeset.user_id 
       raise OSM::APIUserChangesetMismatchError 
     end

-
-    changeset = Changeset.find(params[:id])

     
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
     
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do