| @@ -1,3 +1,6 | |||||
|
|
1 | <% if @journal.private_notes? %> | |||
|
|
2 | (<%= l(:field_private_notes) %>) | |||
|
|
3 | <% end %> | |||
| 1 | <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> |
|
4 | <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> | |
| 2 |
|
5 | |||
| 3 | <ul> |
|
6 | <ul> | |
| @@ -1,4 +1,4 | |||||
| 1 | <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %> |
|
1 | <%= "(#{l(:field_private_notes)}) " if @journal.private_notes? -%><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %> | |
| 2 |
|
2 | |||
| 3 | <% details_to_strings(@journal.details, true).each do |string| -%> |
|
3 | <% details_to_strings(@journal.details, true).each do |string| -%> | |
| 4 | <%= string %> |
|
4 | <%= string %> | |
| @@ -361,6 +361,17 class MailerTest < ActiveSupport::TestCase | |||||
| 361 | assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort |
|
361 | assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort | |
| 362 | end |
|
362 | end | |
| 363 |
|
363 | |||
|
|
364 | def test_issue_edit_should_mark_private_notes | |||
|
|
365 | journal = Journal.find(2) | |||
|
|
366 | journal.private_notes = true | |||
|
|
367 | journal.save! | |||
|
|
368 | ||||
|
|
369 | with_settings :default_language => 'en' do | |||
|
|
370 | Mailer.issue_edit(journal).deliver | |||
|
|
371 | end | |||
|
|
372 | assert_mail_body_match '(Private notes)', last_email | |||
|
|
373 | end | |||
|
|
374 | ||||
| 364 | def test_document_added |
|
375 | def test_document_added | |
| 365 | document = Document.find(1) |
|
376 | document = Document.find(1) | |
| 366 | valid_languages.each do |lang| |
|
377 | valid_languages.each do |lang| | |
General Comments 0
You need to be logged in to leave comments.
Login now