Mailer#url_for not called in views with Rails 3.1.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9023 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f04d59e6dcaf9e5a67bf5e61a79f03fe6c9fd70c..2b079761477628f66e3f0f0ed73d557c3cfef85e 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -99,7 +99,7 @@ module ApplicationHelper
     action = options.delete(:download) ? 'download' : 'show'
     link_to(h(text),
            {:controller => 'attachments', :action => action,
-            :id => attachment, :filename => attachment.filename },
+            :id => attachment, :filename => attachment.filename }.merge(options),
            options)
   end
 

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 29444e703ddf9181c4d69e8b19bb934fc34bd429..66f0b003d71e5cf1f1ea47c9dabc8a40a4a0bbac 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -163,7 +163,8 @@ module IssuesHelper
 
   # Returns the textual representation of a journal details
   # as an array of strings
-  def details_to_strings(details, no_html=false)
+  def details_to_strings(details, no_html=false, options={})
+    options[:only_path] = (options[:only_path] == false ? false : true)
     strings = []
     values_by_field = {}
     details.each do |detail|
@@ -181,23 +182,23 @@ module IssuesHelper
           next
         end
       end
-      strings << show_detail(detail, no_html)
+      strings << show_detail(detail, no_html, options)
     end
     values_by_field.each do |field_id, changes|
       detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
       if changes[:added].any?
         detail.value = changes[:added]
-        strings << show_detail(detail, no_html)
+        strings << show_detail(detail, no_html, options)
       elsif changes[:deleted].any?
         detail.old_value = changes[:deleted]
-        strings << show_detail(detail, no_html)
+        strings << show_detail(detail, no_html, options)
       end
     end
     strings
   end
 
   # Returns the textual representation of a single journal detail
-  def show_detail(detail, no_html=false)
+  def show_detail(detail, no_html=false, options={})
     multiple = false
     case detail.property
     when 'attr'
@@ -250,7 +251,7 @@ module IssuesHelper
       old_value = content_tag("strike", old_value) if detail.old_value and detail.value.blank?
       if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to_attachment(a, :download => true)
+        value = link_to_attachment(a, :download => true, :only_path => options[:only_path])
       else
         value = content_tag("i", h(value)) if value
       end
@@ -260,7 +261,7 @@ module IssuesHelper
       s = l(:text_journal_changed_no_detail, :label => label)
       unless no_html
         diff_link = link_to 'diff',
-          {:controller => 'journals', :action => 'diff', :id => detail.journal_id, :detail_id => detail.id},
+          {:controller => 'journals', :action => 'diff', :id => detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]},
           :title => l(:label_view_diff)
         s << " (#{ diff_link })"
       end

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 5bb4f7e2cd5303541575648e477482f4522b7919..2502ce2e04f02d9ee1f494129481232099f5b2d4 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -30,11 +30,6 @@ class Mailer < ActionMailer::Base
     { :host => h, :protocol => Setting.protocol }
   end
 
-  def url_for(options)
-    options[:only_path] = false if options.is_a?(Hash)
-    super options
-  end
-
   # Builds a tmail object used to email recipients of the added issue.
   #
   # Example:

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index c649e44c96249efe6ddd001e3a5e65d0bdf0d8d6..3d851d4428c99522fc9f322ee2393a8e8135eea8 100644 (file)
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -12,4 +12,4 @@
 <% end %>
 </ul>
 
-<%= textilizable(issue, :description) %>
+<%= textilizable(issue, :description, :only_path => false) %>

diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
index be18e400d10953c50a49bde5cef97e5ac0e249de..8606dd784c6a2926ba45525d8d9f2e8e8b1e909d 100644 (file)
--- a/app/views/mailer/document_added.html.erb
+++ b/app/views/mailer/document_added.html.erb
@@ -1,3 +1,3 @@
 <%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
 <br />
-<%= textilizable(@document, :description) %>
+<%= textilizable(@document, :description, :only_path => false) %>

diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index da406f999c95ff0081eb1472c5efc56e670fac32..3aac5e44f8c1c9ae6e1ce9fd5513c01808aea22f 100644 (file)
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,11 +1,11 @@
 <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
 
 <ul>
-<% details_to_strings(@journal.details).each do |string| %>
+<% details_to_strings(@journal.details, false, :only_path => false).each do |string| %>
   <li><%= string %></li>
 <% end %>
 </ul>
 
-<%= textilizable(@journal, :notes) %>
+<%= textilizable(@journal, :notes, :only_path => false) %>
 <hr />
 <%= render :partial => "issue.html.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index a8ccd2622140363e2abbaff8f4b070dc6e4e5954..f43a8cf0f23a47c5e8797bfc5e213b2663e8a745 100644 (file)
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,4 @@
 <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
 <em><%=h @message.author %></em>
 
-<%= textilizable(@message, :content) %>
+<%= textilizable(@message, :content, :only_path => false) %>

diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index 9a024c09ef7c8cea64d67379cd9f270a278d7fbf..758ebccb8d0a7e1f1d2732e342acb3ea50baa309 100644 (file)
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -1,4 +1,4 @@
 <h1><%= link_to(h(@news.title), @news_url) %></h1>
 <em><%=h @news.author.name %></em>
 
-<%= textilizable(@news, :description) %>
+<%= textilizable(@news, :description, :only_path => false) %>

diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
index b96de1489cc4128b265370c0a2a7f247fd6240bf..ef2be0f653bda45a18d093114090fca34c5784d1 100644 (file)
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -2,4 +2,4 @@
 
 <p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
 
-<%= textilizable @comment, :comments %>
+<%= textilizable @comment, :comments, :only_path => false %>

diff --git a/app/views/mailer/reminder.html.erb b/app/views/mailer/reminder.html.erb
index cfe8c977dac7bfc57dea9b184fcfb8b2fe57d399..f011da3e834c6ff28143299f83e341c3df2d4464 100644 (file)
--- a/app/views/mailer/reminder.html.erb
+++ b/app/views/mailer/reminder.html.erb
@@ -2,7 +2,7 @@
 
 <ul>
 <% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue)%>: <%=h issue.subject %></li>
+  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
 <% end -%>
 </ul>