jro_apps/redmine Commit - r13895:04df8cbbacb7

Merged r14268 (#19815)....

Jean-Philippe Lang -

r13895:04df8cbbacb7

parent child

Context file:

r13895:04df8cbbacb7

app/controllers/issues_controller.rb +6 -3

               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)
                 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)}}
                   orig_issue.reload
                   if @copy
                     issue = orig_issue.copy({},
-                      :attachments => params[:copy_attachments].present?,
+                      :attachments => copy_attachments,
-                      :subtasks => params[:copy_subtasks].present?,
+                      :subtasks => copy_subtasks,
                       :link => link_copy?(params[:link_copy])
                     )
                   else

test/functional/issues_controller_test.rb +2 -2

                 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 => ''
                          }
                 @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 => ''
                        }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages