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

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

@@ -78,4 +78,12 class Journal < ActiveRecord::Base
78	s << ' has-details' unless details.blank?	78	s << ' has-details' unless details.blank?
79	s	79	s
80	end	80	end
		81
		82	def notify?
		83	@notify != false
		84	end
		85
		86	def notify=(arg)
		87	@notify = arg
		88	end
81	end	89	end

app/models/journal_observer.rb +5 -3

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # 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') ||
+                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

@@ -112,6 +112,19 class IssueMovesControllerTest < ActionController::TestCase
112	assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"	112	assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
113	end	113	end
114	end	114	end
		115
		116	should "allow adding a note when copying" do
		117	@request.session[:user_id] = 2
		118	assert_difference 'Issue.count', 1 do
		119	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'
		120	end
		121
		122	issue = Issue.first(:order => 'id DESC')
		123	assert_equal 1, issue.journals.size
		124	journal = issue.journals.first
		125	assert_equal 0, journal.details.size
		126	assert_equal 'Copying one issue', journal.notes
		127	end
115	end	128	end
116		129
117	def test_copy_to_another_project_should_follow_when_needed	130	def test_copy_to_another_project_should_follow_when_needed

test/unit/issue_test.rb +18 0

@@ -523,6 +523,11 class IssueTest < ActiveSupport::TestCase
523	@copy = nil	523	@copy = nil
524	end	524	end
525		525
		526	should "not create a journal" do
		527	@copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:assigned_to_id => 3}})
		528	assert_equal 0, @copy.reload.journals.size
		529	end
		530
526	should "allow assigned_to changes" do	531	should "allow assigned_to changes" do
527	@copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:assigned_to_id => 3}})	532	@copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:assigned_to_id => 3}})
528	assert_equal 3, @copy.assigned_to_id	533	assert_equal 3, @copy.assigned_to_id
@@ -552,6 +557,19 class IssueTest < ActiveSupport::TestCase
552		557
553	assert_equal User.current, @copy.author	558	assert_equal User.current, @copy.author
554	end	559	end
		560
		561	should "keep journal notes" do
		562	date = Date.today
		563	notes = "Notes added when copying"
		564	User.current = User.find(9)
		565	@issue.init_journal(User.current, notes)
		566	@copy = @issue.move_to_project(Project.find(3), Tracker.find(2), {:copy => true, :attributes => {:start_date => date}})
		567
		568	assert_equal 1, @copy.journals.size
		569	journal = @copy.journals.first
		570	assert_equal 0, journal.details.size
		571	assert_equal notes, journal.notes
		572	end
555	end	573	end
556	end	574	end
557		575

test/unit/journal_observer_test.rb +13 -2

@@ -1,5 +1,5
1	# ~~redM~~ine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2009 Jean-Philippe Lang	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -36,6 +36,17 class JournalObserverTest < ActiveSupport::TestCase
36	assert_equal 1, ActionMailer::Base.deliveries.size	36	assert_equal 1, ActionMailer::Base.deliveries.size
37	end	37	end
38		38
		39	def test_create_should_not_send_email_notification_with_notify_set_to_false
		40	Setting.notified_events = ['issue_updated']
		41	issue = Issue.find(:first)
		42	user = User.find(:first)
		43	journal = issue.init_journal(user, issue)
		44	journal.notify = false
		45
		46	assert journal.save
		47	assert_equal 0, ActionMailer::Base.deliveries.size
		48	end
		49
39	def test_create_should_not_send_email_notification_without_issue_updated	50	def test_create_should_not_send_email_notification_without_issue_updated
40	Setting.notified_events = []	51	Setting.notified_events = []
41	issue = Issue.find(:first)	52	issue = Issue.find(: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