Render an empty text string instead of nothing (which actually generate a

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 2e0623df4d7e120e2297784c19ea2c952be6d02f..20e22bb0f8f78b60b06f6d0f67d1363f31512a2c 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -3,7 +3,8 @@ class WayController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create
@@ -12,7 +13,7 @@ class WayController < ApplicationController
 
       if way
         if !way.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed
         else
           way.user_id = @user.id
           way.save_with_history!
@@ -34,7 +35,7 @@ class WayController < ApplicationController
       if way.visible
         render :text => way.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
@@ -50,7 +51,7 @@ class WayController < ApplicationController
 
         if new_way and new_way.id == way.id
           if !new_way.preconditions_ok?
-            render :nothing => true, :status => :precondition_failed
+            render :text => "", :status => :precondition_failed
           else
             way.user_id = @user.id
             way.tags = new_way.tags
@@ -64,7 +65,7 @@ class WayController < ApplicationController
           render :nothing => true, :status => :bad_request
         end
       else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
@@ -77,7 +78,7 @@ class WayController < ApplicationController
 
       if way.visible
         if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='way' and member_id=?", params[:id]])
-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed
         else
           way.user_id = @user.id
           way.tags = []
@@ -88,7 +89,7 @@ class WayController < 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
@@ -114,7 +115,7 @@ class WayController < ApplicationController
 
         render :text => doc.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