summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-10-27 16:27:06 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-10-27 16:27:06 +0000
commite9efa5b9814bbeddd9956b8478ed26af02b0eeca (patch)
treed2b8c54194c7410edd114483d3645d9945aff17a /app/models/mailer.rb
parent70bf0706b2f7933f72cbd4daab8e43b0ac9de4e9 (diff)
downloadredmine-e9efa5b9814bbeddd9956b8478ed26af02b0eeca.tar.gz
redmine-e9efa5b9814bbeddd9956b8478ed26af02b0eeca.zip
Refactor: use :id instead of :page when linking to Wiki Pages
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 6db5a997b..80be7a629 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -178,9 +178,9 @@ class Mailer < ActionMailer::Base
message_id wiki_content
recipients wiki_content.recipients
cc(wiki_content.page.wiki.watcher_recipients - recipients)
- subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
+ subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content,
- :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
+ :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title)
render_multipart('wiki_content_added', body)
end
@@ -195,10 +195,10 @@ class Mailer < ActionMailer::Base
message_id wiki_content
recipients wiki_content.recipients
cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
- subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :page => wiki_content.page.pretty_title)}"
+ subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content,
- :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),
- :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version)
+ :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title),
+ :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :id => wiki_content.page.title, :version => wiki_content.version)
render_multipart('wiki_content_updated', body)
end