diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-18 17:24:23 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-18 17:24:23 +0000 |
| commit | 1093454193bd469d2e344b0a216431cdef27e372 (patch) | |
| tree | febaceb61962744bb6042c6b829958b38782d352 | |
| parent | de394f5f74e0dbf03c54c006ce4e830921515f99 (diff) | |
| download | redmine-1093454193bd469d2e344b0a216431cdef27e372.tar.gz redmine-1093454193bd469d2e344b0a216431cdef27e372.zip | |
Adds markings to emails generated by private comments (#12888).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11869 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/mailer/issue_edit.html.erb | 3 | ||||
| -rw-r--r-- | app/views/mailer/issue_edit.text.erb | 2 | ||||
| -rw-r--r-- | test/unit/mailer_test.rb | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb index 720cfea69..322251912 100644 --- a/app/views/mailer/issue_edit.html.erb +++ b/app/views/mailer/issue_edit.html.erb @@ -1,3 +1,6 @@ +<% if @journal.private_notes? %> + (<%= l(:field_private_notes) %>) +<% end %> <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> <ul> diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb index e0f10811b..395f8f626 100644 --- a/app/views/mailer/issue_edit.text.erb +++ b/app/views/mailer/issue_edit.text.erb @@ -1,4 +1,4 @@ -<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %> +<%= "(#{l(:field_private_notes)}) " if @journal.private_notes? -%><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %> <% details_to_strings(@journal.details, true).each do |string| -%> <%= string %> diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index c1b6ba6ac..f66e5763c 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -361,6 +361,17 @@ class MailerTest < ActiveSupport::TestCase assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort end + def test_issue_edit_should_mark_private_notes + journal = Journal.find(2) + journal.private_notes = true + journal.save! + + with_settings :default_language => 'en' do + Mailer.issue_edit(journal).deliver + end + assert_mail_body_match '(Private notes)', last_email + end + def test_document_added document = Document.find(1) valid_languages.each do |lang| |