Commit 189bf36a authored by maeda's avatar maeda

Time entry creation: preserve 'spent on' value when using 'Create and Continue' (#29308).

Patch by Jens Krämer.


git-svn-id: https://svn.redmine.org/redmine/trunk@17459 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 9d029485
...@@ -113,6 +113,7 @@ class TimelogController < ApplicationController ...@@ -113,6 +113,7 @@ class TimelogController < ApplicationController
:time_entry => { :time_entry => {
:project_id => params[:time_entry][:project_id], :project_id => params[:time_entry][:project_id],
:issue_id => @time_entry.issue_id, :issue_id => @time_entry.issue_id,
:spent_on => @time_entry.spent_on,
:activity_id => @time_entry.activity_id :activity_id => @time_entry.activity_id
}, },
:back_url => params[:back_url] :back_url => params[:back_url]
......
...@@ -281,7 +281,7 @@ class TimelogControllerTest < Redmine::ControllerTest ...@@ -281,7 +281,7 @@ class TimelogControllerTest < Redmine::ControllerTest
}, },
:continue => '1' :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
end end
...@@ -298,7 +298,7 @@ class TimelogControllerTest < Redmine::ControllerTest ...@@ -298,7 +298,7 @@ class TimelogControllerTest < Redmine::ControllerTest
}, },
:continue => '1' :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
end end
...@@ -315,7 +315,7 @@ class TimelogControllerTest < Redmine::ControllerTest ...@@ -315,7 +315,7 @@ class TimelogControllerTest < Redmine::ControllerTest
}, },
:continue => '1' :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
end end
...@@ -332,7 +332,7 @@ class TimelogControllerTest < Redmine::ControllerTest ...@@ -332,7 +332,7 @@ class TimelogControllerTest < Redmine::ControllerTest
}, },
:continue => '1' :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
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment