From 551d0d3a938c05a4b9e488c0aa8f3d812dead8f3 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 4 May 2023 01:01:12 +0100 Subject: [PATCH] Simplify calling #url_for in models --- app/models/application_record.rb | 4 ++++ app/models/enterprise.rb | 12 +++--------- app/models/spree/image.rb | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 6bfeb85c3a..4e726e63b6 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -14,4 +14,8 @@ class ApplicationRecord < ActiveRecord::Base def self.image_service ENV["S3_BUCKET"].present? ? :amazon_public : :local end + + def url_for(*args) + Rails.application.routes.url_helpers.url_for(*args) + end end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index b9a9f15388..10441b45a6 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -297,25 +297,19 @@ class Enterprise < ApplicationRecord def logo_url(name) return unless logo.variable? - Rails.application.routes.url_helpers.url_for( - logo.variant(name) - ) + url_for(logo.variant(name)) end def promo_image_url(name) return unless promo_image.variable? - Rails.application.routes.url_helpers.url_for( - promo_image.variant(name) - ) + url_for(promo_image.variant(name)) end def white_label_logo_url(name = :default) return unless white_label_logo.variable? - Rails.application.routes.url_helpers.url_for( - white_label_logo.variant(name) - ) + url_for(white_label_logo.variant(name)) end def website diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb index 58263e0138..55bb66f0af 100644 --- a/app/models/spree/image.rb +++ b/app/models/spree/image.rb @@ -26,7 +26,7 @@ module Spree def url(size) return unless attachment.attached? - Rails.application.routes.url_helpers.url_for(variant(size)) + url_for(variant(size)) end # if there are errors from the plugin, then add a more meaningful message