From fdd7049857c54295ce5bc443bb9b2b00c3442fdd Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 18 Sep 2020 17:43:35 +0100 Subject: [PATCH] Reuse Spree::Image.set_attachment_definitions --- app/models/spree/image.rb | 2 +- config/initializers/spree.rb | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb index be92cd83fb..cc7518e46c 100644 --- a/app/models/spree/image.rb +++ b/app/models/spree/image.rb @@ -44,7 +44,7 @@ module Spree false end - def self.set_attachment_definitions(config) + def self.set_attachment_definitions Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys! Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path] diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index 9af8019e6c..b3b6fcc279 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -58,14 +58,7 @@ else Spree::Image.attachment_definitions[:attachment].delete :storage end -Spree::Image.attachment_definitions[:attachment][:styles] = - ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys! -Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path] -Spree::Image.attachment_definitions[:attachment][:default_url] = - Spree::Config[:attachment_default_url] -Spree::Image.attachment_definitions[:attachment][:default_style] = - Spree::Config[:attachment_default_style] - +Spree::Image.set_attachment_definitions Spree::Image.reformat_styles # Spree 2.0 recommends explicitly setting this here when using spree_auth_devise