X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e70d94c54a3c449bc12e99d0f3a01a3ef20fc0ab..9c01c4cb639775f4f93f477546124247a33f80d2:/app/controllers/segment_controller.rb

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 42e939a65..b547d5cd1 100644
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -3,7 +3,8 @@ class SegmentController < 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
@@ -19,12 +20,9 @@ class SegmentController < ApplicationController
           segment.user_id = @user.id
           segment.from_node = Node.find(segment.node_a.to_i)
           segment.to_node = Node.find(segment.node_b.to_i)
+          segment.save_with_history!
 
-          if segment.save_with_history
-            render :text => segment.id.to_s, :content_type => "text/plain"
-          else
-            render :nothing => true, :status => :internal_server_error
-          end
+          render :text => segment.id.to_s, :content_type => "text/plain"
         end
       else
         render :nothing => true, :status => :bad_request
@@ -45,8 +43,6 @@ class SegmentController < ApplicationController
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -68,12 +64,9 @@ class SegmentController < ApplicationController
             segment.node_b = new_segment.node_b
             segment.tags = new_segment.tags
             segment.visible = new_segment.visible
+            segment.save_with_history!
 
-            if segment.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
@@ -83,8 +76,6 @@ class SegmentController < ApplicationController
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -98,20 +89,15 @@ class SegmentController < ApplicationController
         else
           segment.user_id = @user.id
           segment.visible = 0
+          segment.save_with_history!
 
-          if segment.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
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end