diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 51ee6db78..eaac60b29 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -553,6 +553,7 @@ class Mailer < ActionMailer::Base @issues_url = url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => 'me', :sort => 'due_date:asc') + @open_issues_count = Issue.visible.open.assigned_to(user).count mail :to => user, :subject => l(:mail_subject_reminder, :count => issues.size, :days => days) end @@ -770,4 +771,3 @@ class Mailer < ActionMailer::Base @references_objects << object end end - diff --git a/app/views/mailer/reminder.html.erb b/app/views/mailer/reminder.html.erb index 506fd697b..a219e4f51 100644 --- a/app/views/mailer/reminder.html.erb +++ b/app/views/mailer/reminder.html.erb @@ -6,4 +6,4 @@ <% end -%> -

<%= link_to l(:label_issue_view_all), @issues_url %>

+

<%= link_to l(:label_issue_view_all), @issues_url %> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>)

diff --git a/app/views/mailer/reminder.text.erb b/app/views/mailer/reminder.text.erb index c9e27dc8d..4954d3a10 100644 --- a/app/views/mailer/reminder.text.erb +++ b/app/views/mailer/reminder.text.erb @@ -4,4 +4,5 @@ * <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %> <% end -%> +<%= l(:label_issue_view_all)%> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>) <%= @issues_url %> diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 418d8ad69..77079bfa7 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -621,10 +621,12 @@ class MailerTest < ActiveSupport::TestCase mail = last_email assert mail.bcc.include?('dlopper@somenet.foo') assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail + assert_mail_body_match 'View all issues (2 open)', mail assert_select_email do assert_select 'a[href=?]', 'http://localhost:3000/issues?assigned_to_id=me&set_filter=1&sort=due_date%3Aasc', :text => 'View all issues' + assert_select '/p:nth-last-of-type(1)', :text => 'View all issues (2 open)' end assert_equal '1 issue(s) due in the next 42 days', mail.subject end