meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-03 23:53:23 +00:00
Code Issues Releases Wiki Activity

Don't create two thumbnails of different resolutions for a single image (#37597).

Browse Source 
Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@21784 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-08-28 06:35:42 +00:00
parent 8d6c82316d
commit 54f281fef9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/application_helper.rb
View File

@ -319,10 +319,11 @@ module ApplicationHelper
def thumbnail_tag(attachment)
thumbnail_size = Setting.thumbnails_size.to_i
thumbnail_path = thumbnail_path(attachment, :size => thumbnail_size * 2)
link_to(
image_tag(
thumbnail_path(attachment),
:srcset => "#{thumbnail_path(attachment, :size => thumbnail_size * 2)} 2x",
thumbnail_path,
:srcset => "#{thumbnail_path} 2x",
:style => "max-width: #{thumbnail_size}px; max-height: #{thumbnail_size}px;",
:loading => "lazy"
),

2
test/functional/issues_controller_test.rb
View File

@ -2756,7 +2756,7 @@ class IssuesControllerTest < Redmine::ControllerTest
end
assert_select 'div.thumbnails' do
assert_select 'a[href="/attachments/16"]' do
assert_select 'img[src="/attachments/thumbnail/16"]'
assert_select 'img[src="/attachments/thumbnail/16/200"]'
end
end
end

2
test/helpers/application_helper_test.rb
View File

@ -1886,7 +1886,7 @@ class ApplicationHelperTest < Redmine::HelperTest
assert_select_in(
thumbnail_tag(a),
'a[href=?][title=?] img[src=?][loading="lazy"]',
"/attachments/3", "logo.gif", "/attachments/thumbnail/3")
"/attachments/3", "logo.gif", "/attachments/thumbnail/3/200")
end
def test_link_to_project