Merged r14069 (#19325).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14091 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 480dfb885451e5d4c229d138169bc7af9c04c63e..e52cc6186ed6476c9d0b9b4e40be3d6eac3ef27c 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -243,10 +243,13 @@ class ApplicationController < ActionController::Base
             redirect_to :controller => "account", :action => "login", :back_url => url
           end
         }
-        format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
+        format.any(:atom, :pdf, :csv) {
+          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"' }
+        format.any  { head :unauthorized }
       end
       return false
     end

diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index befb8fb35c8677a89a5563acc5dea821d2499aa1..e01b44a728f54d5a93b86c6e9116703d52c90796 100644 (file)
--- a/test/integration/application_test.rb
+++ b/test/integration/application_test.rb
@@ -87,4 +87,11 @@ class ApplicationTest < Redmine::IntegrationTest
   ensure
     ActionController::Base.allow_forgery_protection = false
   end
+
+  def test_require_login_with_pdf_format_should_not_error
+    with_settings :login_required => '1' do
+      get '/issues/1.pdf'
+      assert_response 302
+    end
+  end
 end