meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Add icon to attachment link only when icon variable is passed.

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22990 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-08-30 15:50:08 +00:00
parent ee54f091cb
commit 6b327b8852
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/application_helper.rb
View File

@ -128,9 +128,9 @@ module ApplicationHelper
# * :download - Force download (default: false)
def link_to_attachment(attachment, options={})
text = options.delete(:text) || attachment.filename
icon = 'attachment'
icon = options.fetch(:icon, false)
if options.delete(:download)
icon = 'download'
route_method = :download_named_attachment_url
options[:filename] = attachment.filename
else
@ -142,7 +142,9 @@ module ApplicationHelper
options[:only_path] = true unless options.key?(:only_path)
url = send(route_method, attachment, options)
link_to icon_with_label(icon, text), url, html_options
label = icon ? icon_with_label(icon, text) : text
link_to label, url, html_options
end
# Generates a link to a SCM revision

4
app/views/attachments/_links.html.erb
View File

@ -15,9 +15,9 @@
<% for attachment in attachments %>
<tr>
<td>
<%= link_to_attachment attachment, class: 'icon icon-attachment ' -%>
<%= link_to_attachment attachment, class: 'icon icon-attachment ', icon: 'attachment' -%>
<span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
<%= link_to_attachment attachment, class: 'icon-only icon-download ', title: l(:button_download), download: true -%>
<%= link_to_attachment attachment, class: 'icon-only icon-download ', title: l(:button_download), download: true, icon: 'download' -%>
</td>
<td><%= attachment.description unless attachment.description.blank? %></td>
<td>