X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f8ab9e9244550b20b8d3bd97b3567df7020d06d..2c5f6740c74dd754e162bac26db6e9b405234274:/app/controllers/relation_controller.rb diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index c49ecd4d7..d87905059 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -15,11 +15,11 @@ class RelationController < ApplicationController if !relation.preconditions_ok? render :text => "", :status => :precondition_failed else - relation.version = 0 - relation.user_id = @user.id + relation.version = 0 + #relation.user_id = @user.id relation.save_with_history! - render :text => relation.id.to_s, :content_type => "text/plain" + render :text => relation.id.to_s, :content_type => "text/plain" end else render :nothing => true, :status => :bad_request @@ -46,12 +46,13 @@ class RelationController < ApplicationController end def update + logger.debug request.raw_post begin relation = Relation.find(params[:id]) new_relation = Relation.from_xml(request.raw_post) if new_relation and new_relation.id == relation.id - relation.update_from new_relation, user + relation.update_from new_relation, @user render :text => relation.version.to_s, :content_type => "text/plain" else render :nothing => true, :status => :bad_request