meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 11:43:08 +00:00
Code Issues Releases Wiki Activity

Merged r22096 from trunk to 5.0-stable (#35066).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22109 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-02-15 00:24:13 +00:00
parent 215525a197
commit 712ec96174
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/timelog_controller.rb
View File

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

2
test/functional/timelog_controller_test.rb
View File

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