jro_apps/redmine Commit - r9271:231282ddcb73

Fixed MissingFeatureException: let user choose to copy attachments or not when bulk copying issues....

Jean-Philippe Lang -

r9271:231282ddcb73

parent child

Context file:

r9271:231282ddcb73

Collapse all files

app/controllers/issues_controller.rb +4 -1

                  @trackers = target_projects.map(&:trackers).reduce(:&)
                  @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?
+                 end
                  @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                  render :layout => false if request.xhr?
                  @issues.each do |issue|
                    issue.reload
                    if @copy
-                     issue = issue.copy
+                     issue = issue.copy({}, :attachments => params[:copy_attachments].present?)
                    end
                    journal = issue.init_journal(User.current, params[:notes])
                    issue.safe_attributes = attributes

app/models/issue.rb +2 -2

                end
                # Returns an unsaved copy of the issue
-               def copy(attributes=nil)
-                 copy = self.class.new.copy_from(self)
+               def copy(attributes=nil, copy_options={})
+                 copy = self.class.new.copy_from(self, copy_options)
                  copy.attributes = attributes if attributes
                  copy
                end

app/views/issues/bulk_edit.html.erb +7 0

                <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>
              <% end %>
+             <% if @copy && @attachments_present %>
+             <p>
+               <label for='copy_attachments'><%= l(:label_copy_attachments) %></label>
+               <%= check_box_tag 'copy_attachments', '1', true %>
+             </p>
+             <% end %>
              <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
              </div>

test/functional/issues_controller_test.rb +44 -1

                  assert_equal 'Failed to save 1 issue(s) on 2 selected: #2.', flash[:error]
                end
+               def test_get_bulk_copy
+                 @request.session[:user_id] = 2
+                 get :bulk_edit, :ids => [1, 2, 3], :copy => '1'
+                 assert_response :success
+                 assert_template 'bulk_edit'
+                 issues = assigns(:issues)
+                 assert_not_nil issues
+                 assert_equal [1, 2, 3], issues.map(&:id).sort
+                 assert_select 'input[name=copy_attachments]'
+               end
                def test_bulk_copy_to_another_project
                  @request.session[:user_id] = 2
                  assert_difference 'Issue.count', 2 do
                  end
                end
-              def test_bulk_copy_should_allow_changing_the_issue_attributes
+               def test_bulk_copy_should_allow_changing_the_issue_attributes
                  # Fixes random test failure with Mysql
                  # where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
                  # doesn't return the expected results
                  assert_equal 'Copying one issue', journal.notes
                end
+               def test_bulk_copy_should_allow_not_copying_the_attachments
+                 attachment_count = Issue.find(3).attachments.size
+                 assert attachment_count > 0
+                 @request.session[:user_id] = 2
+                 assert_difference 'Issue.count', 1 do
+                   assert_no_difference 'Attachment.count' do
+                     post :bulk_update, :ids => [3], :copy => '1',
+                          :issue => {
+                            :project_id => ''
+                          }
+                   end
+                 end
+               end
+               def test_bulk_copy_should_allow_copying_the_attachments
+                 attachment_count = Issue.find(3).attachments.size
+                 assert attachment_count > 0
+                 @request.session[:user_id] = 2
+                 assert_difference 'Issue.count', 1 do
+                   assert_difference 'Attachment.count', attachment_count do
+                     post :bulk_update, :ids => [3], :copy => '1', :copy_attachments => '1',
+                          :issue => {
+                            :project_id => ''
+                          }
+                   end
+                 end
+               end
                def test_bulk_copy_to_another_project_should_follow_when_needed
                  @request.session[:user_id] = 2
                  post :bulk_update, :ids => [1], :copy => '1', :issue => {:project_id => 2}, :follow => '1'

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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