From 18114a978b7c037da5194c48f860435e261f9a0b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Tue, 21 Jul 2026 22:29:13 +0200 Subject: PDFs currently should have no credits attached to them in display --- app/controllers/related_assets_controller.rb | 2 +- app/models/asset.rb | 4 ++++ app/views/nodes/edit.html.erb | 2 +- test/models/asset_test.rb | 7 +++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb index 560df759..ca894f2f 100644 --- a/app/controllers/related_assets_controller.rb +++ b/app/controllers/related_assets_controller.rb @@ -26,7 +26,7 @@ class RelatedAssetsController < ApplicationController id: related.id, asset_id: asset.id, name: asset.name, - has_credit: asset.has_credit?, + has_credit: asset.show_credit?, thumb_url: asset.upload.url(:thumb), large_url: asset.upload.url(:large), original_url: asset.upload.url, diff --git a/app/models/asset.rb b/app/models/asset.rb index 8aa5415d..9feefa9f 100644 --- a/app/models/asset.rb +++ b/app/models/asset.rb @@ -25,4 +25,8 @@ class Asset < ApplicationRecord def has_credit? creator.present? || source_url.present? || license_key.present? end + + def show_credit? + image? && has_credit? + end end diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index f06ccafc..12dc0003 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb @@ -86,7 +86,7 @@ data-large-url="<%= related.asset.upload.url(:large) %>" data-original-url="<%= related.asset.upload.url %>" data-name="<%= related.asset.name %>" - data-has-credit="<%= related.asset.has_credit? %>" + data-has-credit="<%= related.asset.show_credit? %>" data-headline="<%= related.headline? %>" class="<%= "is_headline" if related.headline? %>"> <%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %> diff --git a/test/models/asset_test.rb b/test/models/asset_test.rb index cda0a04d..ab1cc5df 100644 --- a/test/models/asset_test.rb +++ b/test/models/asset_test.rb @@ -46,4 +46,11 @@ class AssetTest < ActiveSupport::TestCase assert Asset.new(:upload_content_type => "application/pdf").pdf? assert_not Asset.new(:upload_content_type => "image/png").pdf? end + + test "show_credit? is false for a PDF even with every credit field present" do + asset = Asset.new(:name => "demo", :upload_content_type => "application/pdf", + :creator => "Jane Doe", :source_url => "https://example.org", :license_key => "cc_by_4") + assert asset.has_credit? + assert_not asset.show_credit? + end end -- cgit v1.3