From 48a5460da4be45e0e7e5946b870b9a91ee27f086 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 5 Jul 2010 18:00:50 +0000 Subject: [PATCH] Allow js formatted responses. Otherwise they return the invalid format error (406) instead of 403, 404, or 500 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3827 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 909125475..6e5634dbc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -130,6 +130,7 @@ class ApplicationController < ActionController::Base format.html { redirect_to :controller => "account", :action => "login", :back_url => url } format.atom { redirect_to :controller => "account", :action => "login", :back_url => url } format.xml { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } + format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } end return false @@ -240,6 +241,7 @@ class ApplicationController < ActionController::Base format.html { render :template => "common/403", :layout => (request.xhr? ? false : 'base'), :status => 403 } format.atom { head 403 } format.xml { head 403 } + format.js { head 403 } format.json { head 403 } end return false @@ -250,6 +252,7 @@ class ApplicationController < ActionController::Base format.html { render :template => "common/404", :layout => !request.xhr?, :status => 404 } format.atom { head 404 } format.xml { head 404 } + format.js { head 404 } format.json { head 404 } end return false @@ -263,6 +266,7 @@ class ApplicationController < ActionController::Base } format.atom { head 500 } format.xml { head 500 } + format.js { head 500 } format.json { head 500 } end end -- 2.39.5