Fix 500 errors with a POST request that requires a login. #4216

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3050 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 68377b6f7b82799d286f012d48f753a33eb0d2eb..53259554813b5c49c3a6646471b3bc2addc5aed8 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -93,7 +93,13 @@ class ApplicationController < ActionController::Base
   
   def require_login
     if !User.current.logged?
-      redirect_to :controller => "account", :action => "login", :back_url => url_for(params)
+      # Extract only the basic url parameters on non-GET requests
+      if request.get?
+        url = url_for(params)
+      else
+        url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
+      end
+      redirect_to :controller => "account", :action => "login", :back_url => url
       return false
     end
     true

diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index 66c6b21cd7329555b9ff2eb1a1705284d279108a..9ea9e9809651597e3e70cb00e820484ef294ad45 100644 (file)
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -40,4 +40,10 @@ class AdminTest < ActionController::IntegrationTest
     locked_user = User.try_to_login("psmith", "psmith09")
     assert_equal nil, locked_user
   end
+
+  test "Add a user as an anonymous user should fail" do
+    post '/users/add', :user => { :login => 'psmith', :firstname => 'Paul'}, :password => "psmith09", :password_confirmation => "psmith09"
+    assert_response :redirect
+    assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fusers%2Fnew"
+  end
 end