Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 13:55:52 +01:00
Code Issues Packages Projects Releases Activity

Redmine loses filters after deleting a spent time (#14817).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16056 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-12-11 09:25:41 +00:00
parent 3a2b6c7c96
commit d05d559d15
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/timelog_controller.rb
View File

@@ -207,7 +207,7 @@ class TimelogController < ApplicationController
else else
flash[:error] = l(:notice_unable_delete_time_entry) flash[:error] = l(:notice_unable_delete_time_entry)
end 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 { format.api {
if destroyed if destroyed

9
test/functional/timelog_controller_test.rb
View File

@@ -651,6 +651,15 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_not_nil TimeEntry.find_by_id(1) assert_not_nil TimeEntry.find_by_id(1)
end 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 def test_index_all_projects
get :index get :index
assert_response :success assert_response :success