meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-07 16:11:30 +00:00
Code Issues Releases Wiki Activity

Private note flag disappears in issue update conflict (#21551).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14984 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-12-20 10:11:07 +00:00
parent 5ab9e10e7a
commit 48afc0b151
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -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

21
test/functional/issues_controller_transaction_test.rb
View File

@ -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