X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5506b2d9592f04800436c968055f540685efd29e..3461b7a699a753906ba4333ffd8d19deafd33605:/app/controllers/node_controller.rb diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 62987cf94..d3f1ce7f6 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -32,7 +32,7 @@ class NodeController < ApplicationController if node.visible render :text => node.to_xml.to_s, :content_type => "text/xml" else - render :nothing => true, :status => :gone + render :text => "", :status => :gone end rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found @@ -42,23 +42,19 @@ class NodeController < ApplicationController def update begin node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) - if node.visible - new_node = Node.from_xml(request.raw_post) - - if new_node and new_node.id == node.id - node.user_id = @user.id - node.latitude = new_node.latitude - node.longitude = new_node.longitude - node.tags = new_node.tags - node.save_with_history! + if new_node and new_node.id == node.id + node.user_id = @user.id + node.latitude = new_node.latitude + node.longitude = new_node.longitude + node.tags = new_node.tags + node.visible = true + node.save_with_history! - render :nothing => true - else - render :nothing => true, :status => :bad_request - end + render :nothing => true else - render :nothing => true, :status => :gone + render :nothing => true, :status => :bad_request end rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found @@ -71,9 +67,9 @@ class NodeController < ApplicationController if node.visible if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ]) - render :nothing => true, :status => :precondition_failed + render :text => "", :status => :precondition_failed elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]]) - render :nothing => true, :status => :precondition_failed + render :text => "", :status => :precondition_failed else node.user_id = @user.id node.visible = 0 @@ -82,7 +78,7 @@ class NodeController < ApplicationController render :nothing => true end else - render :nothing => true, :status => :gone + render :text => "", :status => :gone end rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found