jro_apps/redmine Commit - r5482:fdb01518697f

Fixed: notes are lost when copying issue(s) (#6901, #8239)....

Jean-Philippe Lang -

r5482:fdb01518697f

parent child

Context file:

r5482:fdb01518697f

Collapse all files

app/models/issue.rb +7 -1

                    issue.attributes = options[:attributes]
                  end
                  if issue.save
-                   unless options[:copy]
+                   if options[:copy]
+                     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
                      # Manually update project_id on related time entries
                      TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})

app/models/journal.rb +8 0

                  s << ' has-details' unless details.blank?
                  s
                end
+               def notify?
+                 @notify != false
+               end
+               def notify=(arg)
+                 @notify = arg
+               end
              end

app/models/journal_observer.rb +8 -6

-             # redMine - project management software
-             # Copyright (C) 2006-2007  Jean-Philippe Lang
+             # Redmine - project management software
+             # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              class JournalObserver < ActiveRecord::Observer
                def after_create(journal)
-                 if Setting.notified_events.include?('issue_updated') ||
-                     (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) ||
-                     (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
-                     (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
+                 if journal.notify? &&
+                     (Setting.notified_events.include?('issue_updated') ||
+                       (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) ||
+                       (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
+                       (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
+                     )
                    Mailer.deliver_issue_edit(journal)
                  end
                end

test/functional/issue_moves_controller_test.rb +13 0

                      assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
                    end
                  end
+                 should "allow adding a note when copying" do
+                   @request.session[:user_id] = 2
+                   assert_difference 'Issue.count', 1 do
+                     post :create, :ids => [1], :copy_options => {:copy => '1'}, :notes => 'Copying one issue', :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
+                   end
+                   issue = Issue.first(:order => 'id DESC')
+                   assert_equal 1, issue.journals.size
+                   journal = issue.journals.first
+                   assert_equal 0, journal.details.size
+                   assert_equal 'Copying one issue', journal.notes
+                 end
                end
                def test_copy_to_another_project_should_follow_when_needed

test/unit/issue_test.rb +18 0

                      @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}})
+                     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}})
                      assert_equal User.current, @copy.author
                    end
+                   should "keep journal notes" do
+                     date = Date.today
+                     notes = "Notes added when copying"
+                     User.current = User.find(9)
+                     @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
+                     assert_equal 0, journal.details.size
+                     assert_equal notes, journal.notes
+                   end
                  end
                end

test/unit/journal_observer_test.rb +13 -2

-             # redMine - project management software
-             # Copyright (C) 2006-2009  Jean-Philippe Lang
+             # Redmine - project management software
+             # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
                  assert journal.save
                  assert_equal 1, ActionMailer::Base.deliveries.size
                end
+               def test_create_should_not_send_email_notification_with_notify_set_to_false
+                 Setting.notified_events = ['issue_updated']
+                 issue = Issue.find(:first)
+                 user = User.find(:first)
+                 journal = issue.init_journal(user, issue)
+                 journal.notify = false
+                 assert journal.save
+                 assert_equal 0, ActionMailer::Base.deliveries.size
+               end
                def test_create_should_not_send_email_notification_without_issue_updated
                  Setting.notified_events = []

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