jro_apps/redmine Commit - r9270:09375960d69d

When copying issues, let the status be changed to default or left unchanged....

Jean-Philippe Lang -

r9270:09375960d69d

parent child

Context file:

r9270:09375960d69d

Collapse all files

app/controllers/issues_controller.rb +5 -1

                  end
                  target_projects ||= @projects
-                 @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
+                 if @copy
+                   @available_statuses = [IssueStatus.default]
+                 else
+                   @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
+                 end
                  @custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.reduce(:&)
                  @assignables = target_projects.map(&:assignable_users).reduce(:&)
                  @trackers = target_projects.map(&:trackers).reduce(:&)

app/models/issue.rb +21 -17

		@@ -511,24 +511,28 class Issue < ActiveRecord::Base
511	511
512	512	# Returns an array of statuses that user is able to apply
513	513	def new_statuses_allowed_to(user=User.current, include_default=false)
514		initial_status = nil
515		if new_record?
516		initial_status = IssueStatus.default
517		elsif status_id_was
518		initial_status = IssueStatus.find_by_id(status_id_was)
	514	if new_record? && @copied_from
	515	[IssueStatus.default, @copied_from.status].compact.uniq.sort
	516	else
	517	initial_status = nil
	518	if new_record?
	519	initial_status = IssueStatus.default
	520	elsif status_id_was
	521	initial_status = IssueStatus.find_by_id(status_id_was)
	522	end
	523	initial_status \|\|= status
	524
	525	statuses = initial_status.find_new_statuses_allowed_to(
	526	user.admin ? Role.all : user.roles_for_project(project),
	527	tracker,
	528	author == user,
	529	assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
	530	)
	531	statuses << initial_status unless statuses.empty?
	532	statuses << IssueStatus.default if include_default
	533	statuses = statuses.compact.uniq.sort
	534	blocked? ? statuses.reject {\|s\| s.is_closed?} : statuses
519	535	end
520		initial_status \|\|= status
521
522		statuses = initial_status.find_new_statuses_allowed_to(
523		user.admin ? Role.all : user.roles_for_project(project),
524		tracker,
525		author == user,
526		assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
527		)
528		statuses << initial_status unless statuses.empty?
529		statuses << IssueStatus.default if include_default
530		statuses = statuses.compact.uniq.sort
531		blocked? ? statuses.reject {\|s\| s.is_closed?} : statuses
532	536	end
533	537
534	538	def assigned_to_was

test/functional/issues_controller_test.rb +29 -15

                    end
                  end
                  assert_redirected_to '/projects/ecookbook/issues'
+                 copies = Issue.all(:order => 'id DESC', :limit => issues.size)
+                 copies.each do |copy|
+                   assert_equal 2, copy.project_id
+                 end
                end
                def test_bulk_copy_should_allow_not_changing_the_issue_attributes
                  @request.session[:user_id] = 2
-                 issue_before_move = Issue.find(1)
-                 assert_difference 'Issue.count', 1 do
-                   assert_no_difference 'Project.find(1).issues.count' do
-                     post :bulk_update, :ids => [1], :copy => '1',
-                          :issue => {
-                            :project_id => '2', :tracker_id => '', :assigned_to_id => '',
-                            :status_id => '', :start_date => '', :due_date => ''
+                          }
-                   end
+                 issues = [
+                   Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 1, :priority_id => 2, :subject => 'issue 1', :author_id => 1, :assigned_to_id => nil),
+                   Issue.create!(:project_id => 2, :tracker_id => 3, :status_id => 2, :priority_id => 1, :subject => 'issue 2', :author_id => 2, :assigned_to_id => 3)
+                 ]
+                 assert_difference 'Issue.count', issues.size do
+                   post :bulk_update, :ids => issues.map(&:id), :copy => '1',
+                        :issue => {
+                          :project_id => '', :tracker_id => '', :assigned_to_id => '',
+                          :status_id => '', :start_date => '', :due_date => ''
+                        }
+                 end
+                 copies = Issue.all(:order => 'id DESC', :limit => issues.size)
+                 issues.each do |orig|
+                   copy = copies.detect {|c| c.subject == orig.subject}
+                   assert_not_nil copy
+                   assert_equal orig.project_id, copy.project_id
+                   assert_equal orig.tracker_id, copy.tracker_id
+                   assert_equal orig.status_id, copy.status_id
+                   assert_equal orig.assigned_to_id, copy.assigned_to_id
+                   assert_equal orig.priority_id, copy.priority_id
                  end
-                 issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
-                 assert_equal issue_before_move.tracker_id, issue_after_move.tracker_id
-                 assert_equal issue_before_move.status_id, issue_after_move.status_id
-                 assert_equal issue_before_move.assigned_to_id, issue_after_move.assigned_to_id
                end
               def test_bulk_copy_should_allow_changing_the_issue_attributes
                      post :bulk_update, :ids => [1, 2], :copy => '1',
                           :issue => {
                             :project_id => '2', :tracker_id => '', :assigned_to_id => '4',
-                            :status_id => '3', :start_date => '2009-12-01', :due_date => '2009-12-31'
+                            :status_id => '1', :start_date => '2009-12-01', :due_date => '2009-12-31'
                           }
                    end
                  end
                  copied_issues.each do |issue|
                    assert_equal 2, issue.project_id, "Project is incorrect"
                    assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
-                   assert_equal 3, issue.status_id, "Status is incorrect"
+                   assert_equal 1, issue.status_id, "Status is incorrect"
                    assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
                    assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
                  end

test/unit/issue_test.rb +8 0

                  assert_equal expected_statuses, issue.new_statuses_allowed_to(admin)
                end
+               def test_new_statuses_allowed_to_should_return_default_and_current_status_when_copying
+                 issue = Issue.find(1).copy
+                 assert_equal [1], issue.new_statuses_allowed_to(User.find(2)).map(&:id)
+                 issue = Issue.find(2).copy
+                 assert_equal [1, 2], issue.new_statuses_allowed_to(User.find(2)).map(&:id)
+               end
                def test_copy
                  issue = Issue.new.copy_from(1)
                  assert issue.copy?

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