jro_apps/redmine Commit - r8903:e6b9ddad18fb

app/helpers/application_helper.rb +1 -1

                  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

app/helpers/issues_helper.rb +8 -7

                # 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|
                        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'
                    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
                    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

app/models/mailer.rb 0 -5

                  { :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:

app/views/mailer/_issue.html.erb +1 -1

              <% end %>
              </ul>
-             <%= textilizable(issue, :description) %>
+             <%= textilizable(issue, :description, :only_path => false) %>

app/views/mailer/document_added.html.erb +1 -1

              <%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
              <br />
-             <%= textilizable(@document, :description) %>
+             <%= textilizable(@document, :description, :only_path => false) %>

app/views/mailer/issue_edit.html.erb +2 -2

              <%= 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 } %>

app/views/mailer/message_posted.html.erb +1 -1

              <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) %>

app/views/mailer/news_added.html.erb +1 -1

              <h1><%= link_to(h(@news.title), @news_url) %></h1>
              <em><%=h @news.author.name %></em>
-             <%= textilizable(@news, :description) %>
+             <%= textilizable(@news, :description, :only_path => false) %>

app/views/mailer/news_comment_added.html.erb +1 -1

              <p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
-             <%= textilizable @comment, :comments %>
+             <%= textilizable @comment, :comments, :only_path => false %>

app/views/mailer/reminder.html.erb +1 -1

              <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>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages