diff options
| author | Go MAEDA <maeda@farend.jp> | 2021-04-01 15:25:40 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2021-04-01 15:25:40 +0000 |
| commit | e74cc0b923b06b34f06a9971f9c674d9d748ed5d (patch) | |
| tree | 8b733a4ece2fa4fdc760510be5f1ab41de286121 /app/controllers | |
| parent | 0037ad1afe9726a449c70473de1933fd1132738a (diff) | |
| download | redmine-e74cc0b923b06b34f06a9971f9c674d9d748ed5d.tar.gz redmine-e74cc0b923b06b34f06a9971f9c674d9d748ed5d.zip | |
Fix detach attachments when a conflict occurs (#29914, #32923).
Patch by Pavel Rosický.
git-svn-id: http://svn.redmine.org/redmine/trunk@20894 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/issues_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f45d9bf06..c994862e1 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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 |