summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-07-21 22:29:13 +0200
committererdgeist <erdgeist@erdgeist.org>2026-07-21 22:29:13 +0200
commit18114a978b7c037da5194c48f860435e261f9a0b (patch)
tree57d4fc0bbdff72c420c0597fc26efff25a188cc0
parent9c951f3a0f379b0f459988106cf3f839acdadbe2 (diff)
PDFs currently should have no credits attached to them in display
-rw-r--r--app/controllers/related_assets_controller.rb2
-rw-r--r--app/models/asset.rb4
-rw-r--r--app/views/nodes/edit.html.erb2
-rw-r--r--test/models/asset_test.rb7
4 files changed, 13 insertions, 2 deletions
diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
index 560df75..ca894f2 100644
--- a/app/controllers/related_assets_controller.rb
+++ b/app/controllers/related_assets_controller.rb
@@ -26,7 +26,7 @@ class RelatedAssetsController < ApplicationController
26 id: related.id, 26 id: related.id,
27 asset_id: asset.id, 27 asset_id: asset.id,
28 name: asset.name, 28 name: asset.name,
29 has_credit: asset.has_credit?, 29 has_credit: asset.show_credit?,
30 thumb_url: asset.upload.url(:thumb), 30 thumb_url: asset.upload.url(:thumb),
31 large_url: asset.upload.url(:large), 31 large_url: asset.upload.url(:large),
32 original_url: asset.upload.url, 32 original_url: asset.upload.url,
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 8aa5415..9feefa9 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -25,4 +25,8 @@ class Asset < ApplicationRecord
25 def has_credit? 25 def has_credit?
26 creator.present? || source_url.present? || license_key.present? 26 creator.present? || source_url.present? || license_key.present?
27 end 27 end
28
29 def show_credit?
30 image? && has_credit?
31 end
28end 32end
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index f06ccaf..12dc000 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -86,7 +86,7 @@
86 data-large-url="<%= related.asset.upload.url(:large) %>" 86 data-large-url="<%= related.asset.upload.url(:large) %>"
87 data-original-url="<%= related.asset.upload.url %>" 87 data-original-url="<%= related.asset.upload.url %>"
88 data-name="<%= related.asset.name %>" 88 data-name="<%= related.asset.name %>"
89 data-has-credit="<%= related.asset.has_credit? %>" 89 data-has-credit="<%= related.asset.show_credit? %>"
90 data-headline="<%= related.headline? %>" 90 data-headline="<%= related.headline? %>"
91 class="<%= "is_headline" if related.headline? %>"> 91 class="<%= "is_headline" if related.headline? %>">
92 <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span> 92 <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span>
diff --git a/test/models/asset_test.rb b/test/models/asset_test.rb
index cda0a04..ab1cc5d 100644
--- a/test/models/asset_test.rb
+++ b/test/models/asset_test.rb
@@ -46,4 +46,11 @@ class AssetTest < ActiveSupport::TestCase
46 assert Asset.new(:upload_content_type => "application/pdf").pdf? 46 assert Asset.new(:upload_content_type => "application/pdf").pdf?
47 assert_not Asset.new(:upload_content_type => "image/png").pdf? 47 assert_not Asset.new(:upload_content_type => "image/png").pdf?
48 end 48 end
49
50 test "show_credit? is false for a PDF even with every credit field present" do
51 asset = Asset.new(:name => "demo", :upload_content_type => "application/pdf",
52 :creator => "Jane Doe", :source_url => "https://example.org", :license_key => "cc_by_4")
53 assert asset.has_credit?
54 assert_not asset.show_credit?
55 end
49end 56end