diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-08-02 08:46:16 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-08-02 08:46:16 +0000 |
| commit | 5377b53db36d28ba551dde1f39e26c5c296b90b7 (patch) | |
| tree | e6cc0863173926c1472a5906a37e13942f421c9d | |
| parent | 375c7adfe41e04286c4943ec0eda50c486738beb (diff) | |
| download | redmine-5377b53db36d28ba551dde1f39e26c5c296b90b7.tar.gz redmine-5377b53db36d28ba551dde1f39e26c5c296b90b7.zip | |
Merged r17459 from trunk to 3.4-stable (#29308).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17460 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 18b911c52..df6b618bd 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -114,6 +114,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 a0b3fad62..d99e2c864 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -276,7 +276,7 @@ class TimelogControllerTest < Redmine::ControllerTest }, :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 @@ -293,7 +293,7 @@ class TimelogControllerTest < Redmine::ControllerTest }, :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 @@ -310,7 +310,7 @@ class TimelogControllerTest < Redmine::ControllerTest }, :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 @@ -327,7 +327,7 @@ class TimelogControllerTest < Redmine::ControllerTest }, :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 |