diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-02-15 00:24:13 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-02-15 00:24:13 +0000 |
| commit | 712ec961748e130ff1f7d279cd7b350a3f460b7b (patch) | |
| tree | e6d44be2f21adb1f242618d67de07e55948e230a | |
| parent | 215525a197a14b29327811111196863d3e436008 (diff) | |
| download | redmine-712ec961748e130ff1f7d279cd7b350a3f460b7b.tar.gz redmine-712ec961748e130ff1f7d279cd7b350a3f460b7b.zip | |
Merged r22096 from trunk to 5.0-stable (#35066).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22109 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/timelog_controller.rb | 1 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 313612b8b..e6848de7e 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -131,6 +131,7 @@ class TimelogController < ApplicationController :back_url => params[:back_url] } if params[:project_id] && @time_entry.project + options[:time_entry][:project_id] ||= @time_entry.project.id redirect_to new_project_time_entry_path(@time_entry.project, options) elsif params[:issue_id] && @time_entry.issue redirect_to new_issue_time_entry_path(@time_entry.issue, options) diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 9046e30a6..128cdc53b 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -458,7 +458,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=&time_entry%5Bspent_on%5D=2008-03-14' + assert_redirected_to '/projects/ecookbook/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 |