Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Merged r17459 from trunk to 3.3-stable (#29308).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17461 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2018-08-02 08:59:45 +00:00
parent ced636c06c
commit 069b0803c5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/timelog_controller.rb
View File

@@ -119,6 +119,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]

8
test/functional/timelog_controller_test.rb
View File

@@ -245,7 +245,7 @@ class TimelogControllerTest < ActionController::TestCase
:spent_on => '2008-03-14', :spent_on => '2008-03-14',
:hours => '7.3'}, :hours => '7.3'},
: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
@@ -258,7 +258,7 @@ class TimelogControllerTest < ActionController::TestCase
:spent_on => '2008-03-14', :spent_on => '2008-03-14',
:hours => '7.3'}, :hours => '7.3'},
: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
@@ -271,7 +271,7 @@ class TimelogControllerTest < ActionController::TestCase
:spent_on => '2008-03-14', :spent_on => '2008-03-14',
:hours => '7.3'}, :hours => '7.3'},
: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
@@ -284,7 +284,7 @@ class TimelogControllerTest < ActionController::TestCase
:spent_on => '2008-03-14', :spent_on => '2008-03-14',
:hours => '7.3'}, :hours => '7.3'},
: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