mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Error responses cleanup (#2692)

Browse Source 
* Use respond_with_error for forbidden errors

* Wrap up common error code into single method
This commit is contained in:
Matt Jankowski 2017-05-01 16:24:36 -04:00 committed by Eugen Rochko
parent 2bd46f442d
commit 7bffd16024
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/application_controller.rb
View File

@ -44,32 +44,20 @@ class ApplicationController < ActionController::Base
protected protected
def not_found def forbidden
respond_to do |format| respond_with_error(403)
format.any { head 404 }
format.html { respond_with_error(404) }
end end
def not_found
respond_with_error(404)
end end
def gone def gone
respond_to do |format| respond_with_error(410)
format.any { head 410 }
format.html { respond_with_error(410) }
end
end
def forbidden
respond_to do |format|
format.any { head 403 }
format.html { render 'errors/403', layout: 'error', status: 403 }
end
end end
def unprocessable_entity def unprocessable_entity
respond_to do |format| respond_with_error(422)
format.any { head 422 }
format.html { respond_with_error(422) }
end
end end
def single_user_mode? def single_user_mode?
@ -105,7 +93,12 @@ class ApplicationController < ActionController::Base
end end
def respond_with_error(code) def respond_with_error(code)
respond_to do |format|
format.any { head code }
format.html do
set_locale set_locale
render "errors/#{code}", layout: 'error', status: code render "errors/#{code}", layout: 'error', status: code
end end
end
end
end end