jro_apps/redmine Commit - r3034:7537e86fd2e4

Fixes that issue copy/move throws an error when status is not changed (#4369)....

Jean-Philippe Lang -

r3034:7537e86fd2e4

parent child

Context file:

r3034:7537e86fd2e4

Collapse all files

app/controllers/issues_controller.rb +3 -1

                    @issues.each do |issue|
                      changed_attributes = {}
                      [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
-                       changed_attributes[valid_attribute] = params[valid_attribute] if params[valid_attribute]
+                       unless params[valid_attribute].blank?
+                         changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
+                       end
                      end
                      issue.init_journal(User.current)
                      if r = issue.move_to(@target_project, new_tracker, {:copy => @copy, :attributes => changed_attributes})

test/functional/issues_controller_test.rb +16 -2

                def test_move_one_issue_to_another_project
                  @request.session[:user_id] = 2
-                 post :move, :id => 1, :new_project_id => 2
+                 post :move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
                  assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                  assert_equal 2, Issue.find(1).project_id
                end
                end
                context "#move via bulk copy" do
+                 should "allow not changing the issue's attributes" do
+                   @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 :move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
+                     end
+                   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
                  should "allow changing the issue's attributes" do
                    @request.session[:user_id] = 2
                    assert_difference 'Issue.count', 2 do
                      assert_no_difference 'Project.find(1).issues.count' do
-                       post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
+                       post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
                      end
                    end

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