jro_apps/redmine Commit - r12699:b69587819348

Adds an option to send email on "Assignee updated" in application settings (#16362)....

Jean-Philippe Lang -

r12699:b69587819348

parent child

Context file:

r12699:b69587819348

Collapse all files

app/models/journal.rb +10 -4

                 end
               end
+              # Returns the JournalDetail for the given attribute, or nil if the attribute
+              # was not updated
+              def detail_for_attribute(attribute)
+                details.detect {|detail| detail.prop_key == attribute}
+              end
               # Returns the new status if the journal contains a status change, otherwise nil
               def new_status
-                c = details.detect {|detail| detail.prop_key == 'status_id'}
+                s = new_value_for('status_id')
-                (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
+                s ? IssueStatus.find_by_id(s.to_i) : nil
               end
               def new_value_for(prop)
-                c = details.detect {|detail| detail.prop_key == prop}
+                detail_for_attribute(prop).try(:value)
-                c ? c.value : nil
               end
               def editable_by?(usr)
                 if notify? && (Setting.notified_events.include?('issue_updated') ||
                     (Setting.notified_events.include?('issue_note_added') && notes.present?) ||
                     (Setting.notified_events.include?('issue_status_updated') && new_status.present?) ||
+                    (Setting.notified_events.include?('issue_assigned_to_updated') && new_value_for('assigned_to_id').present?) ||
                     (Setting.notified_events.include?('issue_priority_updated') && new_value_for('priority_id').present?)
                   )
                   Mailer.deliver_issue_edit(self)

lib/redmine/notifiable.rb +1 0

                   notifications << Notifiable.new('issue_updated')
                   notifications << Notifiable.new('issue_note_added', 'issue_updated')
                   notifications << Notifiable.new('issue_status_updated', 'issue_updated')
+                  notifications << Notifiable.new('issue_assigned_to_updated', 'issue_updated')
                   notifications << Notifiable.new('issue_priority_updated', 'issue_updated')
                   notifications << Notifiable.new('news_added')
                   notifications << Notifiable.new('news_comment_added')

test/unit/journal_observer_test.rb +38 -2

@@ -87,7 +87,6 class JournalObserverTest < ActiveSupport::TestCase
87	assert_equal 0, ActionMailer::Base.deliveries.size	87	assert_equal 0, ActionMailer::Base.deliveries.size
88	end	88	end
89		89
90	# context: issue_status_updated notified_events
91	def test_create_should_send_email_notification_with_issue_status_updated	90	def test_create_should_send_email_notification_with_issue_status_updated
92	issue = Issue.first	91	issue = Issue.first
93	user = User.first	92	user = User.first
@@ -112,7 +111,44 class JournalObserverTest < ActiveSupport::TestCase
112	assert_equal 0, ActionMailer::Base.deliveries.size	111	assert_equal 0, ActionMailer::Base.deliveries.size
113	end	112	end
114		113
115	# context: issue_priority_updated notified_events	114	def test_create_without_status_update_should_not_send_email_notification_with_issue_status_updated
		115	issue = Issue.first
		116	user = User.first
		117	issue.init_journal(user, issue)
		118	issue.subject = "No status update"
		119
		120	with_settings :notified_events => %w(issue_status_updated) do
		121	assert issue.save
		122	end
		123	assert_equal 0, ActionMailer::Base.deliveries.size
		124	end
		125
		126	def test_create_should_send_email_notification_with_issue_assignee_updated
		127	issue = Issue.generate!(:assigned_to_id => 2)
		128	ActionMailer::Base.deliveries.clear
		129	user = User.first
		130	issue.init_journal(user, issue)
		131	issue.assigned_to = User.find(3)
		132
		133	with_settings :notified_events => %w(issue_assigned_to_updated) do
		134	assert issue.save
		135	end
		136	assert_equal 1, ActionMailer::Base.deliveries.size
		137	end
		138
		139	def test_create_should_not_send_email_notification_without_issue_assignee_updated
		140	issue = Issue.generate!(:assigned_to_id => 2)
		141	ActionMailer::Base.deliveries.clear
		142	user = User.first
		143	issue.init_journal(user, issue)
		144	issue.assigned_to = User.find(3)
		145
		146	with_settings :notified_events => [] do
		147	assert issue.save
		148	end
		149	assert_equal 0, ActionMailer::Base.deliveries.size
		150	end
		151
116	def test_create_should_send_email_notification_with_issue_priority_updated	152	def test_create_should_send_email_notification_with_issue_priority_updated
117	issue = Issue.first	153	issue = Issue.first
118	user = User.first	154	user = User.first

test/unit/lib/redmine/notifiable_test.rb +1 -1

               def test_all
                 assert_equal 12, Redmine::Notifiable.all.length
-                %w(issue_added issue_updated issue_note_added issue_status_updated issue_priority_updated news_added news_comment_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable|
+                %w(issue_added issue_updated issue_note_added issue_status_updated issue_status_updated issue_priority_updated news_added news_comment_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable|
                   assert Redmine::Notifiable.all.collect(&:name).include?(notifiable), "missing #{notifiable}"
                 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