diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-08-02 08:59:45 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-08-02 08:59:45 +0000 |
| commit | 069b0803c575b1268b08749e5e97119ca28357c2 (patch) | |
| tree | 8888785e9c2b4dfbeb444f4bd333756801346d64 | |
| parent | ced636c06c3141144b6d94fc90ec2337019e9317 (diff) | |
| download | redmine-069b0803c575b1268b08749e5e97119ca28357c2.tar.gz redmine-069b0803c575b1268b08749e5e97119ca28357c2.zip | |
Merged r17459 from trunk to 3.3-stable (#29308).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17461 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/timelog_controller.rb | 1 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 908e7ebac..aecb8fb98 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -119,6 +119,7 @@ class TimelogController < ApplicationController :time_entry => { :project_id => params[:time_entry][:project_id], :issue_id => @time_entry.issue_id, + :spent_on => @time_entry.spent_on, :activity_id => @time_entry.activity_id }, :back_url => params[:back_url] diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index b1c64f5d4..da6d010a2 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -245,7 +245,7 @@ class TimelogControllerTest < ActionController::TestCase :spent_on => '2008-03-14', :hours => '7.3'}, :continue => '1' - assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1' + assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1&time_entry%5Bspent_on%5D=2008-03-14' end end @@ -258,7 +258,7 @@ class TimelogControllerTest < ActionController::TestCase :spent_on => '2008-03-14', :hours => '7.3'}, :continue => '1' - assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D=' + assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D=&time_entry%5Bspent_on%5D=2008-03-14' end end @@ -271,7 +271,7 @@ class TimelogControllerTest < ActionController::TestCase :spent_on => '2008-03-14', :hours => '7.3'}, :continue => '1' - assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=' + assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=&time_entry%5Bspent_on%5D=2008-03-14' end end @@ -284,7 +284,7 @@ class TimelogControllerTest < ActionController::TestCase :spent_on => '2008-03-14', :hours => '7.3'}, :continue => '1' - assert_redirected_to '/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D=' + assert_redirected_to '/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D=&time_entry%5Bspent_on%5D=2008-03-14' end end |