jro_apps/redmine Commit - r10152:197a14a82e3e

Fixed that the reminder email excludes issues assigned to groups (#11723)....

Jean-Philippe Lang -

r10152:197a14a82e3e

parent child

Context file:

r10152:197a14a82e3e

app/models/mailer.rb +10 -1

               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
-              # * :users    => array of user ids who should be reminded
+              # * :users    => array of user/group ids who should be reminded
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 scope = scope.scoped(:conditions => {:tracker_id => tracker.id}) if tracker
                 issues_by_assignee = scope.all(:include => [:status, :assigned_to, :project, :tracker]).group_by(&:assigned_to)
+                issues_by_assignee.keys.each do |assignee|
+                  if assignee.is_a?(Group)
+                    assignee.users.each do |user|
+                      issues_by_assignee[user] ||= []
+                      issues_by_assignee[user] += issues_by_assignee[assignee]
+                    end
+                  end
+                end
                 issues_by_assignee.each do |assignee, issues|
                   reminder(assignee, issues, days).deliver if assignee.is_a?(User) && assignee.active?
                 end

lib/tasks/reminder.rake +1 -1

               * days     => number of days to remind about (defaults to 7)
               * tracker  => id of tracker (defaults to all trackers)
               * project  => id or identifier of project (defaults to all projects)
-              * users    => comma separated list of user ids who should be reminded
+              * users    => comma separated list of user/group ids who should be reminded
             Example:
               rake redmine:send_reminders days=7 users="1,23, 56" RAILS_ENV="production"

test/unit/mailer_test.rb +21 0

@@ -508,6 +508,27 class MailerTest < ActiveSupport::TestCase
508	assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail	508	assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail
509	end	509	end
510		510
		511	def test_reminder_should_include_issues_assigned_to_groups
		512	with_settings :default_language => 'en' do
		513	group = Group.generate!
		514	group.users << User.find(2)
		515	group.users << User.find(3)
		516
		517	Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 1,
		518	:subject => 'Assigned to group', :assigned_to => group,
		519	:due_date => 5.days.from_now,
		520	:author_id => 2)
		521	ActionMailer::Base.deliveries.clear
		522
		523	Mailer.reminders(:days => 7)
		524	assert_equal 2, ActionMailer::Base.deliveries.size
		525	assert_equal %w(dlopper@somenet.foo jsmith@somenet.foo), ActionMailer::Base.deliveries.map(&:bcc).flatten.sort
		526	ActionMailer::Base.deliveries.each do \|mail\|
		527	assert_mail_body_match 'Assigned to group', mail
		528	end
		529	end
		530	end
		531
511	def test_mailer_should_not_change_locale	532	def test_mailer_should_not_change_locale
512	Setting.default_language = 'en'	533	Setting.default_language = 'en'
513	# Set current language to italian	534	# Set current language to italian

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