From c76a021e92e77036152935ac19af10893f56669f Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 2 Aug 2018 06:00:10 +0000 Subject: [PATCH] Time entry creation: preserve 'spent on' value when using 'Create and Continue' (#29308). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@17459 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/timelog_controller.rb | 1 + 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 6bd7ab387..c23e47713 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -113,6 +113,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 652ee1270..943d69cbc 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -281,7 +281,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 @@ -298,7 +298,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 @@ -315,7 +315,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 @@ -332,7 +332,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 -- 2.39.5