Download as
Browse Code »

Commit 6a5c9a59b3d79af19b468281943d26ed8333b6f9

Authored by Antonio Terceiro
1 parent 62221a7d
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Do not redirect AJAX requests

Showing 1 changed file with 6 additions and 2 deletions   Show diff stats
lib/authenticated_system.rb
  Diff comments   View file @6a5c9a5
@@ -64,8 +64,12 @@ module AuthenticatedSystem @@ -64,8 +64,12 @@ module AuthenticatedSystem
64 def access_denied 64 def access_denied
65 respond_to do |accepts| 65 respond_to do |accepts|
66 accepts.html do 66 accepts.html do
67 - store_location  
68 - redirect_to :controller => '/account', :action => 'login' 67 + if request.xhr?
  68 + render :text => _('Access denied'), :status => 401
  69 + else
  70 + store_location
  71 + redirect_to :controller => '/account', :action => 'login'
  72 + end
69 end 73 end
70 accepts.xml do 74 accepts.xml do
71 headers["Status"] = "Unauthorized" 75 headers["Status"] = "Unauthorized"