pass common API error text through to Potlatch so it can be shown to the user

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 5b0a632f75091a37bef05e2e95e6272351027da3..ab83d4ec3cbb1a2ea334e0e8b9936450a60972f3 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -3,8 +3,9 @@ class WayController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_write_availability, :only => [:create, :update, :delete]
-  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  before_filter :require_public_data, :only => [:create, :update, :delete]
+  before_filter :check_api_writable, :only => [:create, :update, :delete]
+  before_filter :check_api_readable, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create
@@ -22,6 +23,7 @@ class WayController < ApplicationController
         render :nothing => true, :status => :method_not_allowed
       end
     rescue OSM::APIError => ex
+      logger.warn request.raw_post
       render ex.render_opts
     end
   end
@@ -56,6 +58,7 @@ class WayController < ApplicationController
         render :nothing => true, :status => :bad_request
       end
     rescue OSM::APIError => ex
+      logger.warn request.raw_post
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found