jro_apps/redmine Commit - r8419:165373575883

Deprecated Issue#move_to_project....

Jean-Philippe Lang -

r8419:165373575883

parent child

Context file:

r8419:165373575883

Collapse all files

app/controllers/issues_controller.rb +1 -1

                 @issues.each do |issue|
                   issue.reload
                   if @copy
-                    issue = Issue.new.copy_from(issue)
+                    issue = issue.copy
                   end
                   journal = issue.init_journal(User.current, params[:notes])
                   issue.safe_attributes = attributes

app/models/issue.rb +10 -1

                 self
               end
+              # Returns an unsaved copy of the issue
+              def copy(attributes=nil)
+                copy = self.class.new.copy_from(self)
+                copy.attributes = attributes if attributes
+                copy
+              end
               # Moves/copies an issue to a new project and tracker
               # Returns the moved/copied issue on success, false on failure
               def move_to_project(new_project, new_tracker=nil, options={})
+                ActiveSupport::Deprecation.warn "Issue#move_to_project is deprecated, use #project= instead."
                 if options[:copy]
-                  issue = self.class.new.copy_from(self)
+                  issue = self.copy
                 else
                   issue = self
                 end

test/unit/issue_nested_set_test.rb +6 -2

                 child =   create_issue!(:parent_issue_id => parent1.id)
                 grandchild = create_issue!(:parent_issue_id => child.id)
-                assert child.reload.move_to_project(Project.find(2))
+                child.reload
+                child.project = Project.find(2)
+                assert child.save
                 child.reload
                 grandchild.reload
                 parent1.reload
                 assert_equal [1, parent1.id, 1, 6], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
                 # child can not be moved to Project 2 because its child is on a disabled tracker
-                assert_equal false, Issue.find(child.id).move_to_project(Project.find(2))
+                child = Issue.find(child.id)
+                child.project = Project.find(2)
+                assert !child.save
                 child.reload
                 grandchild.reload
                 parent1.reload

test/unit/issue_test.rb +41 -35

               def test_move_to_another_project_with_same_category
                 issue = Issue.find(1)
-                assert issue.move_to_project(Project.find(2))
+                issue.project = Project.find(2)
+                assert issue.save
                 issue.reload
                 assert_equal 2, issue.project_id
                 # Category changes
               def test_move_to_another_project_without_same_category
                 issue = Issue.find(2)
-                assert issue.move_to_project(Project.find(2))
+                issue.project = Project.find(2)
+                assert issue.save
                 issue.reload
                 assert_equal 2, issue.project_id
                 # Category cleared
               def test_move_to_another_project_should_clear_fixed_version_when_not_shared
                 issue = Issue.find(1)
                 issue.update_attribute(:fixed_version_id, 1)
-                assert issue.move_to_project(Project.find(2))
+                issue.project = Project.find(2)
+                assert issue.save
                 issue.reload
                 assert_equal 2, issue.project_id
                 # Cleared fixed_version
               def test_move_to_another_project_should_keep_fixed_version_when_shared_with_the_target_project
                 issue = Issue.find(1)
                 issue.update_attribute(:fixed_version_id, 4)
-                assert issue.move_to_project(Project.find(5))
+                issue.project = Project.find(5)
+                assert issue.save
                 issue.reload
                 assert_equal 5, issue.project_id
                 # Keep fixed_version
               def test_move_to_another_project_should_clear_fixed_version_when_not_shared_with_the_target_project
                 issue = Issue.find(1)
                 issue.update_attribute(:fixed_version_id, 1)
-                assert issue.move_to_project(Project.find(5))
+                issue.project = Project.find(5)
+                assert issue.save
                 issue.reload
                 assert_equal 5, issue.project_id
                 # Cleared fixed_version
               def test_move_to_another_project_should_keep_fixed_version_when_shared_systemwide
                 issue = Issue.find(1)
                 issue.update_attribute(:fixed_version_id, 7)
-                assert issue.move_to_project(Project.find(2))
+                issue.project = Project.find(2)
+                assert issue.save
                 issue.reload
                 assert_equal 2, issue.project_id
                 # Keep fixed_version
                 target = Project.find(2)
                 target.tracker_ids = [3]
                 target.save
-                assert_equal false, issue.move_to_project(target)
+                issue.project = target
+                assert issue.save
                 issue.reload
-                assert_equal 1, issue.project_id
+                assert_equal 2, issue.project_id
+                assert_equal 3, issue.tracker_id
               end
               def test_copy_to_the_same_project
                 issue = Issue.find(1)
-                copy = nil
+                copy = issue.copy
                 assert_difference 'Issue.count' do
-                  copy = issue.move_to_project(issue.project, nil, :copy => true)
+                  copy.save!
                 end
                 assert_kind_of Issue, copy
                 assert_equal issue.project, copy.project
               def test_copy_to_another_project_and_tracker
                 issue = Issue.find(1)
-                copy = nil
+                copy = issue.copy(:project_id => 3, :tracker_id => 2)
                 assert_difference 'Issue.count' do
-                  copy = issue.move_to_project(Project.find(3), Tracker.find(2), :copy => true)
+                  copy.save!
                 end
                 copy.reload
                 assert_kind_of Issue, copy
                 assert_nil copy.custom_value_for(2)
               end
-              context "#move_to_project" do
+              context "#copy" do
-                context "as a copy" do
                 setup do
                   @issue = Issue.find(1)
-                    @copy = nil
                 end
                 should "not create a journal" do
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:assigned_to_id => 3}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :assigned_to_id => 3)
-                    assert_equal 0, @copy.reload.journals.size
+                  copy.save!
+                  assert_equal 0, copy.reload.journals.size
                 end
                 should "allow assigned_to changes" do
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:assigned_to_id => 3}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :assigned_to_id => 3)
-                    assert_equal 3, @copy.assigned_to_id
+                  assert_equal 3, copy.assigned_to_id
                 end
                 should "allow status changes" do
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:status_id => 2}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :status_id => 2)
-                    assert_equal 2, @copy.status_id
+                  assert_equal 2, copy.status_id
                 end
                 should "allow start date changes" do
                   date = Date.today
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:start_date => date}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :start_date => date)
-                    assert_equal date, @copy.start_date
+                  assert_equal date, copy.start_date
                 end
                 should "allow due date changes" do
                   date = Date.today
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:due_date => date}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :due_date => date)
+                  assert_equal date, copy.due_date
-                    assert_equal date, @copy.due_date
                 end
                 should "set current user as author" do
                   User.current = User.find(9)
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2)
+                  assert_equal User.current, copy.author
-                    assert_equal User.current, @copy.author
                 end
                 should "create a journal with notes" do
                   date = Date.today
                   notes = "Notes added when copying"
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :notes => notes, :attributes => {:start_date => date}})
+                  copy = @issue.copy(:project_id => 3, :tracker_id => 2, :start_date => date)
+                  copy.init_journal(User.current, notes)
+                  copy.save!
-                    assert_equal 1, @copy.journals.size
+                  assert_equal 1, copy.journals.size
-                    journal = @copy.journals.first
+                  journal = copy.journals.first
                   assert_equal 0, journal.details.size
                   assert_equal notes, journal.notes
                 end
               end
-              end
               def test_recipients_should_not_include_users_that_cannot_view_the_issue
                 issue = Issue.find(12)
                 assert issue.recipients.include?(issue.author.mail)
-                # move the issue to a private project
+                # copy the issue to a private project
-                copy  = issue.move_to_project(Project.find(5), Tracker.find(2), :copy => true)
+                copy  = issue.copy(:project_id => 5, :tracker_id => 2)
                 # author is not a member of project anymore
                 assert !copy.recipients.include?(copy.author.mail)
               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