From 4ddc0825f5f25fddf0778821f22d7569a0707442 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Thu, 20 Jun 2013 21:17:33 +0530 Subject: [PATCH] Remove code duplication in ApplicationController --- app/controllers/application_controller.rb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cdcdfc5edaa..edd3efd45f7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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