Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-06 21:35:46 +02:00
Code Issues Packages Projects Releases Activity

Add configurable setting for copying attachments when copying an issue (#36197).

Browse Source 
Patch by Yuichi HARADA (user:yui.har).


git-svn-id: https://svn.redmine.org/redmine/trunk@22926 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-07-14 01:49:53 +00:00
parent 6322650728
commit 6c8b04d6d5
7 changed files with 115 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/issues_controller.rb
View File

@@ -328,7 +328,8 @@ class IssuesController < ApplicationController
@versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
@categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
if @copy
@attachments_present = @issues.detect {|i| i.attachments.any?}.present?
@attachments_present = @issues.detect {|i| i.attachments.any?}.present? &&
(Setting.copy_attachments_on_issue_copy == 'ask')
@subtasks_present = @issues.detect {|i| !i.leaf?}.present?
@watchers_present = User.current.allowed_to?(:add_issue_watchers, @projects) &&
Watcher.where(:watchable_type => 'Issue',
@@ -347,7 +348,6 @@ class IssuesController < ApplicationController
attributes = parse_params_for_bulk_update(params[:issue])
copy_subtasks = (params[:copy_subtasks] == '1')
copy_attachments = (params[:copy_attachments] == '1')
copy_watchers = (params[:copy_watchers] == '1')
if @copy
@@ -386,7 +386,7 @@ class IssuesController < ApplicationController
if @copy
issue = orig_issue.copy(
{},
:attachments => copy_attachments,
:attachments => copy_attachments?(params[:copy_attachments]),
:subtasks => copy_subtasks,
:watchers => copy_watchers,
:link => link_copy?(params[:link_copy])
@@ -593,7 +593,7 @@ class IssuesController < ApplicationController
end
@link_copy = link_copy?(params[:link_copy]) || request.get?
@copy_attachments = params[:copy_attachments].present? || request.get?
@copy_attachments = copy_attachments?(params[:copy_attachments]) || request.get?
@copy_subtasks = params[:copy_subtasks].present? || request.get?
@copy_watchers = User.current.allowed_to?(:add_issue_watchers, @project)
@issue.copy_from(@copy_from, :attachments => @copy_attachments,
@@ -696,6 +696,19 @@ class IssuesController < ApplicationController
end
end
# Returns true if the attachments should be copied
# from the original issue
def copy_attachments?(param)
case Setting.copy_attachments_on_issue_copy
when 'yes'
true
when 'no'
false
when 'ask'
param == '1'
end
end
# Redirects user after a successful issue creation
def redirect_after_create
if params[:continue]