Move PermalinkGenerator out of lib directory

2026-01-24 20:36:49 +00:00 · 2022-01-15 12:22:34 +00:00
parent 1953a2ef6a
commit ea312c78b0
3 changed files with 2 additions and 3 deletions
--- a/lib/open_food_network/permalink_generator.rb
+++ b/lib/open_food_network/permalink_generator.rb
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true

 require 'open_food_network/locking'
-require 'open_food_network/permalink_generator'
 require 'spree/core/s3_support'

 class EnterpriseGroup < ApplicationRecord
  include PermalinkGenerator
+  include Spree::Core::S3Support
+
  acts_as_list

  has_and_belongs_to_many :enterprises, join_table: 'enterprise_groups_enterprises'
@@ -39,7 +40,6 @@ class EnterpriseGroup < ApplicationRecord
  validates_attachment_content_type :logo, content_type: %r{\Aimage/.*\Z}
  validates_attachment_content_type :promo_image, content_type: %r{\Aimage/.*\Z}

-  include Spree::Core::S3Support
  supports_s3 :logo
  supports_s3 :promo_image

--- a/app/models/spree/product.rb
+++ b/app/models/spree/product.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true

-require 'open_food_network/permalink_generator'
 require 'open_food_network/property_merge'
 require 'concerns/product_stock'