Skip to content

fix: ロゴファイルをアップロードしていない場合エラーになる問題 #2543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
takaishi merged 1 commit into from
May 21, 2025
Merged

fix: ロゴファイルをアップロードしていない場合エラーになる問題 #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/models/sponsor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,12 @@ def booth_sponsor?
end
false
end

def logo_url
if sponsor_attachment_logo_image&.file_data&.present?
sponsor_attachment_logo_image&.file_url
else
sponsor_attachment_logo_image&.url
end
end
end
2 changes: 1 addition & 1 deletion app/views/api/v1/sponsors/index.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ json.array!(@sponsors) do |sponsor|
json.name(sponsor.name)
json.abbr(sponsor.abbr)
json.url(sponsor.url)
json.logo_url(sponsor.sponsor_attachment_logo_image.file_data.present? ? sponsor.sponsor_attachment_logo_image.file_url : image_url(sponsor.sponsor_attachment_logo_image.url))
json.logo_url(sponsor.logo_url ? image_url(sponsor.logo_url) : '')
json.sponsorType(sponsor.sponsor_types.map { |type| type.name })
end
Loading