From 2496d4396b788995fe9f5f956be2a88d8198ca22 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 5 Feb 2023 23:30:46 +0000 Subject: [PATCH] Fix missing project_id in redirect after clicking "Create and add another" button (#35066). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Jérôme BATAILLE. git-svn-id: https://svn.redmine.org/redmine/trunk@22096 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/timelog_controller.rb | 1 + test/functional/timelog_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index d4caca0f6..f6859597a 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 c0c923377..5aa5eec7c 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -471,7 +471,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 -- 2.39.5