Skip to content

Commit 6d79cfd

Browse files
committed
fix derivative enabled check
1 parent 5e87457 commit 6d79cfd

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

app/uploaders/application_uploader.rb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,17 @@ def generate_location(io, record: nil, derivative: nil, metadata: {}, **)
9191
end
9292

9393
Attacher.derivatives do |original|
94-
break unless SiteSettings.generate_image_derivatives
95-
if context[:record]&.is_image?
96-
Shrine.with_file(original) do |it|
97-
magick = ImageProcessing::MiniMagick.source(it)
98-
{
99-
preview: magick.resize_to_limit!(320, 320),
100-
carousel: magick.resize_to_limit!(1024, 768)
101-
}
94+
if SiteSettings.generate_image_derivatives
95+
if context[:record]&.is_image?
96+
Shrine.with_file(original) do |it|
97+
magick = ImageProcessing::MiniMagick.source(it)
98+
{
99+
preview: magick.resize_to_limit!(320, 320),
100+
carousel: magick.resize_to_limit!(1024, 768)
101+
}
102+
end
103+
else
104+
{}
102105
end
103106
else
104107
{}

0 commit comments

Comments
 (0)