Selaa lähdekoodia

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

git-svn-id: http://svn.redmine.org/redmine/trunk@16056 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 vuotta sitten
vanhempi
commit
d05d559d15

+ 1
- 1
app/controllers/timelog_controller.rb Näytä tiedosto

@@ -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

+ 9
- 0
test/functional/timelog_controller_test.rb Näytä tiedosto

@@ -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

Loading…
Peruuta
Tallenna