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

Fix detach attachments when a conflict occurs (#29914, #32923).

Browse Source 
Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@20894 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-04-01 15:25:40 +00:00
parent 0037ad1afe
commit e74cc0b923
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/issues_controller.rb
View File

@ -189,6 +189,7 @@ class IssuesController < ApplicationController
begin
saved = save_issue_with_child_records
rescue ActiveRecord::StaleObjectError
@issue.detach_saved_attachments
@conflict = true
if params[:last_journal_id]
@conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a