Commit 0d1f5035 authored by jplang's avatar jplang
Browse files

Initialize TimeEntry attributes with params when editing an issue (#5441).

git-svn-id: https://svn.redmine.org/redmine/trunk@4411 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e97a1cce
......@@ -269,6 +269,7 @@ private
@priorities = IssuePriority.all
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
@time_entry = TimeEntry.new
@time_entry.attributes = params[:time_entry]
@notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
@issue.init_journal(User.current, @notes)
......
......@@ -737,7 +737,8 @@ class IssuesControllerTest < ActionController::TestCase
def test_get_edit_with_params
@request.session[:user_id] = 2
get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 }
get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 },
:time_entry => { :hours => '2.5', :comments => 'test_get_edit_with_params', :activity_id => TimeEntryActivity.first.id }
assert_response :success
assert_template 'edit'
......@@ -755,6 +756,12 @@ class IssuesControllerTest < ActionController::TestCase
:child => { :tag => 'option',
:content => 'Urgent',
:attributes => { :selected => 'selected' } }
assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => '2.5' }
assert_tag :select, :attributes => { :name => 'time_entry[activity_id]' },
:child => { :tag => 'option',
:attributes => { :selected => 'selected', :value => TimeEntryActivity.first.id } }
assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => 'test_get_edit_with_params' }
end
def test_update_edit_form
......
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