Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1055 from vipulnsward/dedeuplicate_app_controller 

Remove code duplication in ApplicationController
This commit is contained in:
Robin Ward 2013-06-20 09:55:09 -07:00
parent 4aa20cf23c 4ddc0825f5
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 end
rescue_from Discourse::NotFound do rescue_from Discourse::NotFound do
rescue_discourse_actions("[error: 'not found']", 404)
if request.format && request.format.json?
render status: 404, layout: false, text: "[error: 'not found']"
else
render_not_found_page(404)
end
end end
rescue_from Discourse::InvalidAccess do rescue_from Discourse::InvalidAccess do
if request.format && request.format.json? rescue_discourse_actions("[error: 'invalid access']", 403)
render status: 403, layout: false, text: "[error: 'invalid access']"
else
render_not_found_page(403)
end
end 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 def set_locale
I18n.locale = SiteSetting.default_locale I18n.locale = SiteSetting.default_locale