jro_apps/redmine Commit - r8092:7d2298f39c60

Save an @Issue#save@....

Etienne Massip -

r8092:7d2298f39c60

parent child

Context file:

r8092:7d2298f39c60

app/controllers/issue_moves_controller.rb +1 -3

                   moved_issues = []
                   @issues.each do |issue|
                     issue.reload
-                    issue.init_journal(User.current)
-                    issue.current_journal.notes = @notes if @notes.present?
                     call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
-                    if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)})
+                    if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params), :notes => @notes})
                       moved_issues << r
                     else
                       unsaved_issue_ids << issue.id

app/models/issue.rb +11 -7

               def move_to_project_without_transaction(new_project, new_tracker = nil, options = {})
                 options ||= {}
-                issue = options[:copy] ? self.class.new.copy_from(self) : self
+                if options[:copy]
+                  issue = self.class.new.copy_from(self)
+                else
+                  issue = self
+                  issue.init_journal(User.current, options[:notes])
+                end
                 if new_project && issue.project_id != new_project.id
                   # delete issue relations
                 if options[:attributes]
                   issue.attributes = options[:attributes]
                 end
-                if issue.save
+                if options[:copy] && options[:notes].present?
-                  if options[:copy]
+                  issue.init_journal(User.current, options[:notes])
-                    if current_journal && current_journal.notes.present?
-                      issue.init_journal(current_journal.user, current_journal.notes)
                   issue.current_journal.notify = false
-                      issue.save
                 end
-                  else
+                if issue.save
+                  unless options[:copy]
                     # Manually update project_id on related time entries
                     TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})

test/unit/issue_test.rb +2 -4

                     assert_equal User.current, @copy.author
                   end
-                  should "keep journal notes" do
+                  should "create a journal with notes" do
                     date = Date.today
                     notes = "Notes added when copying"
-                    User.current = User.find(9)
+                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :notes => notes, :attributes => {:start_date => date}})
-                    @issue.init_journal(User.current, notes)
-                    @copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:start_date => date}})
                     assert_equal 1, @copy.journals.size
                     journal = @copy.journals.first

General Comments 0

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

No TODOs yet

	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