diff --git a/config/application.rb b/config/application.rb index fd25737a4e..5dc43f997c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -240,6 +240,7 @@ module Openfoodnetwork config.generators.template_engine = :haml Rails.application.routes.default_url_options[:host] = ENV["SITE_URL"] + DfcProvider::Engine.routes.default_url_options[:host] = ENV["SITE_URL"] Rails.autoloaders.main.ignore(Rails.root.join('app/webpacker')) diff --git a/engines/dfc_provider/app/serializers/dfc_provider/base_serializer.rb b/engines/dfc_provider/app/serializers/dfc_provider/base_serializer.rb index 02394a8813..06ecb236ae 100644 --- a/engines/dfc_provider/app/serializers/dfc_provider/base_serializer.rb +++ b/engines/dfc_provider/app/serializers/dfc_provider/base_serializer.rb @@ -6,10 +6,6 @@ module DfcProvider class BaseSerializer < ActiveModel::Serializer private - def host - Rails.application.routes.default_url_options[:host] - end - def dfc_provider_routes DfcProvider::Engine.routes.url_helpers end diff --git a/engines/dfc_provider/app/serializers/dfc_provider/catalog_item_serializer.rb b/engines/dfc_provider/app/serializers/dfc_provider/catalog_item_serializer.rb index edaf72ae7c..0ff979ad47 100644 --- a/engines/dfc_provider/app/serializers/dfc_provider/catalog_item_serializer.rb +++ b/engines/dfc_provider/app/serializers/dfc_provider/catalog_item_serializer.rb @@ -17,7 +17,6 @@ module DfcProvider dfc_provider_routes.enterprise_catalog_item_url( enterprise_id: object.product.supplier_id, id: object.id, - host: host ) end @@ -44,7 +43,6 @@ module DfcProvider dfc_provider_routes.enterprise_supplied_product_url( enterprise_id: object.product.supplier_id, id: object.id, - host: host ) end end diff --git a/engines/dfc_provider/app/serializers/dfc_provider/enterprise_serializer.rb b/engines/dfc_provider/app/serializers/dfc_provider/enterprise_serializer.rb index 7428a54652..b45b52250e 100644 --- a/engines/dfc_provider/app/serializers/dfc_provider/enterprise_serializer.rb +++ b/engines/dfc_provider/app/serializers/dfc_provider/enterprise_serializer.rb @@ -18,7 +18,6 @@ module DfcProvider def id dfc_provider_routes.enterprise_url( id: object.id, - host: host ) end diff --git a/engines/dfc_provider/app/serializers/dfc_provider/person_serializer.rb b/engines/dfc_provider/app/serializers/dfc_provider/person_serializer.rb index 2e93775167..2210550960 100644 --- a/engines/dfc_provider/app/serializers/dfc_provider/person_serializer.rb +++ b/engines/dfc_provider/app/serializers/dfc_provider/person_serializer.rb @@ -30,7 +30,6 @@ module DfcProvider def id dfc_provider_routes.person_url( id: object.id, - host: host ) end diff --git a/engines/dfc_provider/app/serializers/dfc_provider/supplied_product_serializer.rb b/engines/dfc_provider/app/serializers/dfc_provider/supplied_product_serializer.rb index db6540535d..836b20e3ed 100644 --- a/engines/dfc_provider/app/serializers/dfc_provider/supplied_product_serializer.rb +++ b/engines/dfc_provider/app/serializers/dfc_provider/supplied_product_serializer.rb @@ -20,7 +20,6 @@ module DfcProvider dfc_provider_routes.enterprise_supplied_product_url( enterprise_id: object.product.supplier_id, id: object.id, - host: host ) end