codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1055 from vipulnsward/dedeuplicate_app_controller

Browse source 
Remove code duplication in ApplicationController
This commit is contained in:
Robin Ward 2013-06-20 09:55:09 -07:00
commit 6c37a8f8fb
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/application_controller.rb
View file

@ -66,23 +66,20 @@ class ApplicationController < ActionController::Base
end
rescue_from Discourse::NotFound do
if request.format && request.format.json?
render status: 404, layout: false, text: "[error: 'not found']"
else
render_not_found_page(404)
end
rescue_discourse_actions("[error: 'not found']", 404)
end
rescue_from Discourse::InvalidAccess do
if request.format && request.format.json?
render status: 403, layout: false, text: "[error: 'invalid access']"
else
render_not_found_page(403)
end
rescue_discourse_actions("[error: 'invalid access']", 403)
end
def rescue_discourse_actions(message, error)
if request.format && request.format.json?
render status: error, layout: false, text: message
else
render_not_found_page(error)
end
end
def set_locale
I18n.locale = SiteSetting.default_locale