meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 01:11:12 +00:00
Code Issues Releases Wiki Activity

Fixed that copying issues always copy subtasks and attachments even if option is unchecked (#11787).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14268 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-05-23 07:08:53 +00:00
parent 24d6211f4e
commit 09b935b44e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/issues_controller.rb
View File

@ -248,7 +248,10 @@ class IssuesController < ApplicationController
def bulk_update
@issues.sort!
@copy = params[:copy].present?
attributes = parse_params_for_bulk_issue_attributes(params)
copy_subtasks = (params[:copy_subtasks] == '1')
copy_attachments = (params[:copy_attachments] == '1')
if @copy
unless User.current.allowed_to?(:copy_issues, @projects)
@ -266,7 +269,7 @@ class IssuesController < ApplicationController
unsaved_issues = []
saved_issues = []
if @copy && params[:copy_subtasks].present?
if @copy && copy_subtasks
# Descendant issues will be copied with the parent task
# Don't copy them twice
@issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
@ -276,8 +279,8 @@ class IssuesController < ApplicationController
orig_issue.reload
if @copy
issue = orig_issue.copy({},
:attachments => params[:copy_attachments].present?,
:subtasks => params[:copy_subtasks].present?,
:attachments => copy_attachments,
:subtasks => copy_subtasks,
:link => link_copy?(params[:link_copy])
)
else

4
test/functional/issues_controller_test.rb
View File

@ -4025,7 +4025,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_difference 'Issue.count', 1 do
assert_no_difference 'Attachment.count' do
post :bulk_update, :ids => [3], :copy => '1',
post :bulk_update, :ids => [3], :copy => '1', :copy_attachments => '0',
:issue => {
:project_id => ''
}
@ -4066,7 +4066,7 @@ class IssuesControllerTest < ActionController::TestCase
@request.session[:user_id] = 2
assert_difference 'Issue.count', 1 do
post :bulk_update, :ids => [issue.id], :copy => '1',
post :bulk_update, :ids => [issue.id], :copy => '1', :copy_subtasks => '0',
:issue => {
:project_id => ''
}