Fixes #4861

Since the around_action is defined before authorize_resource is called, the 
handler needs to pass on the CanCan::AccessDenied exception.

I've added the timeouts where I think they were missing (e.g. 
UserPreferencesController) but I've kept the exception for changeset#upload 
and traces#create
You can view, comment on, or merge this pull request online at:

  https://github.com/openstreetmap/openstreetmap-website/pull/5245

-- Commit Summary --

  * Move api error handling and timeouts to parent class

-- File Changes --

    M app/controllers/api/capabilities_controller.rb (1)
    M app/controllers/api/changeset_comments_controller.rb (3)
    M app/controllers/api/changesets_controller.rb (3)
    M app/controllers/api/map_controller.rb (2)
    M app/controllers/api/messages_controller.rb (2)
    M app/controllers/api/nodes_controller.rb (2)
    M app/controllers/api/notes_controller.rb (1)
    M app/controllers/api/old_elements_controller.rb (1)
    M app/controllers/api/permissions_controller.rb (1)
    M app/controllers/api/relations_controller.rb (2)
    M app/controllers/api/tracepoints_controller.rb (2)
    M app/controllers/api/traces_controller.rb (2)
    M app/controllers/api/user_blocks_controller.rb (1)
    M app/controllers/api/user_preferences_controller.rb (2)
    M app/controllers/api/users_controller.rb (1)
    M app/controllers/api/versions_controller.rb (1)
    M app/controllers/api/ways_controller.rb (2)
    M app/controllers/api_controller.rb (4)

-- Patch Links --

https://github.com/openstreetmap/openstreetmap-website/pull/5245.patch
https://github.com/openstreetmap/openstreetmap-website/pull/5245.diff

-- 
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5245
You are receiving this because you are subscribed to this thread.

Message ID: <openstreetmap/openstreetmap-website/pull/5...@github.com>
_______________________________________________
rails-dev mailing list
rails-dev@openstreetmap.org
https://lists.openstreetmap.org/listinfo/rails-dev

Reply via email to