kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed links in new file notification broken by r4051 (#6590). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-03-27 16:38:08 +00:00
parent 100a53d240
commit 08f44b67f5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/mailer.rb
View File

@ -114,11 +114,11 @@ class Mailer < ActionMailer::Base
added_to_url = '' added_to_url = ''
case container.class.name case container.class.name
when 'Project' when 'Project'
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container) added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
added_to = "#{l(:label_project)}: #{container}" added_to = "#{l(:label_project)}: #{container}"
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail} recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
when 'Version' when 'Version'
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id) added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
added_to = "#{l(:label_version)}: #{container.name}" added_to = "#{l(:label_version)}: #{container.name}"
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail} recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
when 'Document' when 'Document'

7
test/unit/mailer_test.rb
View File

@ -26,6 +26,7 @@ class MailerTest < ActiveSupport::TestCase
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
Setting.host_name = 'mydomain.foo' Setting.host_name = 'mydomain.foo'
Setting.protocol = 'http' Setting.protocol = 'http'
Setting.plain_text_mail = '0'
end end
def test_generated_links_in_emails def test_generated_links_in_emails
@ -278,6 +279,9 @@ class MailerTest < ActiveSupport::TestCase
assert Mailer.deliver_attachments_added(attachements) assert Mailer.deliver_attachments_added(attachements)
assert_not_nil last_email.bcc assert_not_nil last_email.bcc
assert last_email.bcc.any? assert last_email.bcc.any?
assert_select_email do
assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files"
end
end end
def test_project_file_added def test_project_file_added
@ -285,6 +289,9 @@ class MailerTest < ActiveSupport::TestCase
assert Mailer.deliver_attachments_added(attachements) assert Mailer.deliver_attachments_added(attachements)
assert_not_nil last_email.bcc assert_not_nil last_email.bcc
assert last_email.bcc.any? assert last_email.bcc.any?
assert_select_email do
assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files"
end
end end
def test_news_added def test_news_added