diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb index 177ec176..bb931ac3 100644 --- a/app/controllers/campaigns_controller.rb +++ b/app/controllers/campaigns_controller.rb @@ -51,7 +51,7 @@ class CampaignsController < ApplicationController @peer_to_peer_campaign_param = @campaign.id end - @campaign_background_image = FetchBackgroundImage.with_model(@campaign) + @campaign_background_image = @campaign.background_image.attached? && url_for(@campaign.background_image_by_size(:normal)) end def activities diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index b3522da3..21d2e7a3 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -19,7 +19,7 @@ class EventsController < ApplicationController def show @event = params[:event_slug] ? Event.find_by_slug!(params[:event_slug]) : Event.find_by_id!(params[:id]) - @event_background_image = FetchBackgroundImage.with_model(@event) + @event_background_image = @event.background_image.attached? && url_for(@event.background_image_by_size(:normal)) @nonprofit = @event.nonprofit if @event.deleted && !current_event_editor? redirect_to nonprofit_path(current_nonprofit) @@ -71,7 +71,7 @@ class EventsController < ApplicationController def stats @event = current_event @url = Format::Url.concat(root_url, @event.url) - @event_background_image = FetchBackgroundImage.with_model(@event) + @event_background_image = @event.background_image.attached? && url_for(@event.background_image_by_size(:normal)) render layout: 'layouts/embed' end diff --git a/lib/create/create_peer_to_peer_campaign.rb b/lib/create/create_peer_to_peer_campaign.rb index 91d997ca..f7ac746f 100644 --- a/lib/create/create_peer_to_peer_campaign.rb +++ b/lib/create/create_peer_to_peer_campaign.rb @@ -24,17 +24,17 @@ module CreatePeerToPeerCampaign campaign.save begin - campaign.update_attribute(:main_image, parent_campaign.main_image) if parent_campaign.main_image + campaign.main_image.attach(parent_campaign.main_image.blob) if parent_campaign.main_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end begin - campaign.update_attribute(:background_image, parent_campaign.background_image) if parent_campaign.background_image + campaign.background_image.attach(parent_campaign.background_image.blob) if parent_campaign.background_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end begin - campaign.update_attribute(:banner_image, parent_campaign.banner_image) if parent_campaign.banner_image + campaign.banner_image.attach(parent_campaign.banner_image.blob) if parent_campaign.banner_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end diff --git a/lib/fetch/fetch_background_image.rb b/lib/fetch/fetch_background_image.rb deleted file mode 100644 index 5c3a7e72..00000000 --- a/lib/fetch/fetch_background_image.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -module FetchBackgroundImage - def self.with_model(model) - return model.background_image_url(:normal) unless model.background_image.file.nil? - end -end diff --git a/lib/insert/insert_duplicate.rb b/lib/insert/insert_duplicate.rb index d0c68f07..3fa26af0 100644 --- a/lib/insert/insert_duplicate.rb +++ b/lib/insert/insert_duplicate.rb @@ -30,13 +30,13 @@ module InsertDuplicate dupe.save! begin - dupe.update_attribute(:main_image, campaign.main_image) if campaign.main_image + dupe.main_image.attach(campaign.main_image.blob) if campaign.main_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end begin - dupe.update_attribute(:background_image, campaign.background_image) if campaign.background_image + dupe.background_image.attach(campaign.background_image.blob) if campaign.background_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end @@ -84,13 +84,13 @@ module InsertDuplicate dupe.save! begin - dupe.update_attribute(:main_image, event.main_image) if event.main_image + dupe.main_image.attach(event.main_image.blob) if event.main_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end begin - dupe.update_attribute(:background_image, event.background_image) if event.background_image + dupe.background_image.attach( event.background_image.blob) if event.background_image.attached? rescue StandardError AWS::S3::Errors::NoSuchKey end