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)
+              def copy(attributes=nil, copy_options={})
-                copy = self.class.new.copy_from(self)
+                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

@@ -3057,6 +3057,19 class IssuesControllerTest < ActionController::TestCase
3057	assert_equal 'Failed to save 1 issue(s) on 2 selected: #2.', flash[:error]	3057	assert_equal 'Failed to save 1 issue(s) on 2 selected: #2.', flash[:error]
3058	end	3058	end
3059		3059
		3060	def test_get_bulk_copy
		3061	@request.session[:user_id] = 2
		3062	get :bulk_edit, :ids => [1, 2, 3], :copy => '1'
		3063	assert_response :success
		3064	assert_template 'bulk_edit'
		3065
		3066	issues = assigns(:issues)
		3067	assert_not_nil issues
		3068	assert_equal [1, 2, 3], issues.map(&:id).sort
		3069
		3070	assert_select 'input[name=copy_attachments]'
		3071	end
		3072
3060	def test_bulk_copy_to_another_project	3073	def test_bulk_copy_to_another_project
3061	@request.session[:user_id] = 2	3074	@request.session[:user_id] = 2
3062	assert_difference 'Issue.count', 2 do	3075	assert_difference 'Issue.count', 2 do
@@ -3099,7 +3112,7 class IssuesControllerTest < ActionController::TestCase
3099	end	3112	end
3100	end	3113	end
3101		3114
3102	def test_bulk_copy_should_allow_changing_the_issue_attributes	3115	def test_bulk_copy_should_allow_changing_the_issue_attributes
3103	# Fixes random test failure with Mysql	3116	# Fixes random test failure with Mysql
3104	# where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})	3117	# where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
3105	# doesn't return the expected results	3118	# doesn't return the expected results
@@ -3145,6 +3158,36 class IssuesControllerTest < ActionController::TestCase
3145	assert_equal 'Copying one issue', journal.notes	3158	assert_equal 'Copying one issue', journal.notes
3146	end	3159	end
3147		3160
		3161	def test_bulk_copy_should_allow_not_copying_the_attachments
		3162	attachment_count = Issue.find(3).attachments.size
		3163	assert attachment_count > 0
		3164	@request.session[:user_id] = 2
		3165
		3166	assert_difference 'Issue.count', 1 do
		3167	assert_no_difference 'Attachment.count' do
		3168	post :bulk_update, :ids => [3], :copy => '1',
		3169	:issue => {
		3170	:project_id => ''
		3171	}
		3172	end
		3173	end
		3174	end
		3175
		3176	def test_bulk_copy_should_allow_copying_the_attachments
		3177	attachment_count = Issue.find(3).attachments.size
		3178	assert attachment_count > 0
		3179	@request.session[:user_id] = 2
		3180
		3181	assert_difference 'Issue.count', 1 do
		3182	assert_difference 'Attachment.count', attachment_count do
		3183	post :bulk_update, :ids => [3], :copy => '1', :copy_attachments => '1',
		3184	:issue => {
		3185	:project_id => ''
		3186	}
		3187	end
		3188	end
		3189	end
		3190
3148	def test_bulk_copy_to_another_project_should_follow_when_needed	3191	def test_bulk_copy_to_another_project_should_follow_when_needed
3149	@request.session[:user_id] = 2	3192	@request.session[:user_id] = 2
3150	post :bulk_update, :ids => [1], :copy => '1', :issue => {:project_id => 2}, :follow => '1'	3193	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