]> source.dussan.org Git - redmine.git/commitdiff
Redmine loses filters after deleting a spent time (#14817).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 11 Dec 2016 09:25:41 +0000 (09:25 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 11 Dec 2016 09:25:41 +0000 (09:25 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@16056 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/timelog_controller.rb
test/functional/timelog_controller_test.rb

index 6c0cd3ee641b88d4d36f33f8f90ac6c761c7990f..a88ede4a555c1ad3a4020a5e84dab335493832b2 100644 (file)
@@ -207,7 +207,7 @@ class TimelogController < ApplicationController
         else
           flash[:error] = l(:notice_unable_delete_time_entry)
         end
-        redirect_back_or_default project_time_entries_path(@projects.first)
+        redirect_back_or_default project_time_entries_path(@projects.first), :referer => true
       }
       format.api  {
         if destroyed
index 6af830125acd7faf200c76e81401074d640518a6..594fb1e198060f56663517be996b2b88d0748686 100644 (file)
@@ -651,6 +651,15 @@ class TimelogControllerTest < Redmine::ControllerTest
     assert_not_nil TimeEntry.find_by_id(1)
   end
 
+  def test_destroy_should_redirect_to_referer
+    referer = 'http://test.host/time_entries?utf8=✓&set_filter=1&&f%5B%5D=user_id&op%5Buser_id%5D=%3D&v%5Buser_id%5D%5B%5D=me'
+    @request.env["HTTP_REFERER"] = referer
+    @request.session[:user_id] = 2
+
+    delete :destroy, :params => {:id => 1}
+    assert_redirected_to referer
+  end
+
   def test_index_all_projects
     get :index
     assert_response :success