diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/related_assets_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/asset.rb | 4 | ||||
| -rw-r--r-- | app/views/nodes/edit.html.erb | 2 |
3 files changed, 6 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 | |||
| 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 8aa5415d..9feefa9f 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 | ||
| 28 | end | 32 | 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 @@ | |||
| 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> |
