cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge rails_port as of r4613 & fix tests.

Browse source
This commit is contained in:
Gabriel Ebner 2007-09-20 14:37:29 +00:00
commit cfbdd3f7e1
52 changed files with 696 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/relation_controller.rb
View file

@ -15,12 +15,9 @@ class RelationController < ApplicationController
render :nothing => true, :status => :precondition_failed
else
relation.user_id = @user.id
relation.save_with_history!
if relation.save_with_history
render :text => relation.id.to_s, :content_type => "text/plain"
else
render :text => "save error", :status => :internal_server_error
end
render :text => relation.id.to_s, :content_type => "text/plain"
end
else
render :nothing => true, :status => :bad_request
@ -61,12 +58,9 @@ class RelationController < ApplicationController
relation.tags = new_relation.tags
relation.members = new_relation.members
relation.visible = true
relation.save_with_history!
if relation.save_with_history
render :nothing => true
else
render :nothing => true, :status => :internal_server_error
end
render :nothing => true
end
else
render :nothing => true, :status => :bad_request
@ -94,12 +88,9 @@ class RelationController < ApplicationController
relation.tags = []
relation.members = []
relation.visible = false
relation.save_with_history!
if relation.save_with_history
render :nothing => true
else
render :nothing => true, :status => :internal_server_error
end
render :nothing => true
end
else
render :nothing => true, :status => :gone