Skip to content

Commit 390a097

Browse files
committed
refactor render presence check into ModelFile method
1 parent f35e334 commit 390a097

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

app/components/preview_frame.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def render_local
3838
div class: "card-img-top #{"sensitive" if needs_hiding?}" do
3939
Renderer file: @file
4040
end
41-
elsif @file.is_3d_model? && @file.attachment(:render)
41+
elsif @file.has_render?
4242
image model_model_file_path(@file.model, @file, format: @file.extension, derivative: "render"), @file.name
4343
else
4444
empty

app/models/model_file.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ def is_renderable?
8383
["stl", "obj", "3mf", "ply", "gltf", "glb", "drc", "fbx", "3ds", "gcode", "mpd", "ldr", "3dm"].include? extension
8484
end
8585

86+
def has_render?
87+
is_3d_model? && attachment_attacher.derivatives.key?(:render)
88+
end
89+
8690
def mime_type
8791
Mime::Type.lookup_by_extension(extension)
8892
end

app/views/model_files/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</ul>
4040
<% end %>
4141
<%= Renderer(file: @file) %>
42-
<% elsif @file.is_3d_model? && @file.attachment(:render) %>
42+
<% elsif @file.has_render? %>
4343
<%= image_tag model_model_file_path(@model, @file, format: @file.extension, derivative: "render"), style: "width: 100%", alt: @file.name %>
4444
<% end %>
4545
<% if @file.notes %>

app/views/models/_file.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="card-img-top">
88
<%= Renderer(file: file) %>
99
</div>
10-
<% elsif file.is_3d_model? && file.attachment(:render) %>
10+
<% elsif file.has_render? %>
1111
<%= content_tag :div, nil, class: "card-img-top card-img-top-background", style: "background-image: url(#{model_model_file_path(@model, file, format: file.extension)})" %>
1212
<%= image_tag model_model_file_path(file.model, file, format: file.extension, derivative: "render"), class: "card-img-top image-preview", alt: file.name %>
1313
<% else %>

0 commit comments

Comments
 (0)