diff options
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
| -rw-r--r-- | test/functional/issues_controller_transaction_test.rb | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 80f02409a..1e1057c7d 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -388,7 +388,7 @@ class IssuesController < ApplicationController issue_attributes = issue_attributes.dup issue_attributes.delete(:lock_version) when 'add_notes' - issue_attributes = issue_attributes.slice(:notes) + issue_attributes = issue_attributes.slice(:notes, :private_notes) when 'cancel' redirect_to issue_path(@issue) return false diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index b38b09641..603b44a12 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -210,6 +210,27 @@ class IssuesControllerTransactionTest < ActionController::TestCase assert_nil issue.fixed_version_id journal = Journal.order('id DESC').first assert_equal 'add_notes_conflict_resolution', journal.notes + assert_equal false, journal.private_notes + assert journal.details.empty? + end + + def test_update_stale_issue_with_add_notes_conflict_resolution_should_preserve_private_notes + @request.session[:user_id] = 2 + + journal = new_record(Journal) do + put :update, :id => 1, + :issue => { + :fixed_version_id => 4, + :notes => 'add_privates_notes_conflict_resolution', + :private_notes => '1', + :lock_version => 2 + }, + :conflict_resolution => 'add_notes' + end + + assert_response 302 + assert_equal 'add_privates_notes_conflict_resolution', journal.notes + assert_equal true, journal.private_notes assert journal.details.empty? end |