jro_apps/redmine Commit - r4079:945cd3933e37

Merged r4167 from trunk....

Eric Davis -

r4079:945cd3933e37

parent child

Context file:

r4079:945cd3933e37

Collapse all files

app/models/mailer.rb +5 0

             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+            require 'ar_condition'
             class Mailer < ActionMailer::Base
               layout 'mailer'
               helper :application
               # * :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
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
+                user_ids = options[:users]
                 s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
                 s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
+                s << ["#{Issue.table_name}.assigned_to_id IN (?)", user_ids] if user_ids.present?
                 s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
                 s << "#{Issue.table_name}.project_id = #{project.id}" if project
                 s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker

lib/tasks/reminder.rake +3 -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
             Example:
-              rake redmine:send_reminders days=7 RAILS_ENV="production"
+              rake redmine:send_reminders days=7 users="1,23, 56" RAILS_ENV="production"
             END_DESC
             namespace :redmine do
                 options[:days] = ENV['days'].to_i if ENV['days']
                 options[:project] = ENV['project'] if ENV['project']
                 options[:tracker] = ENV['tracker'].to_i if ENV['tracker']
+                options[:users] = (ENV['users'] || '').split(',').each(&:strip!)
                 Mailer.reminders(options)
               end

test/unit/mailer_test.rb +10 0

@@ -355,6 +355,16 class MailerTest < ActiveSupport::TestCase
355	assert_equal '1 issue(s) due in the next 42 days', mail.subject	355	assert_equal '1 issue(s) due in the next 42 days', mail.subject
356	end	356	end
357		357
		358	def test_reminders_for_users
		359	Mailer.reminders(:days => 42, :users => ['5'])
		360	assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper
		361	Mailer.reminders(:days => 42, :users => ['3'])
		362	assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper
		363	mail = ActionMailer::Base.deliveries.last
		364	assert mail.bcc.include?('dlopper@somenet.foo')
		365	assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
		366	end
		367
358	def last_email	368	def last_email
359	mail = ActionMailer::Base.deliveries.last	369	mail = ActionMailer::Base.deliveries.last
360	assert_not_nil mail	370	assert_not_nil mail

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