raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable variant option_values to be successfully eager-loaded

Browse Source
This commit is contained in:
Matt-Yorkley
2019-11-05 14:23:27 +00:00
parent 689eb88332
commit 6e58ffa927
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/open_food_network/variant_and_line_item_naming.rb
View File

@@ -8,11 +8,17 @@ module OpenFoodNetwork
module VariantAndLineItemNaming
# Copied and modified from Spree::Variant
def options_text
values = option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
values = if option_values_eager_loaded?
# Don't trigger N+1 queries if option_values are already eager-loaded.
# For best results, use: `Spree::Variant.includes(option_values: :option_type)`
# or: `Spree::Product.includes(variant: {option_values: :option_type})`
option_values.sort_by{ |o| o.option_type.position }
else
option_values.joins(:option_type).
order("#{Spree::OptionType.table_name}.position asc")
end
values.map!(&:presentation) # This line changed
values.to_sentence(words_connector: ", ", two_words_connector: ", ")
values.map(&:presentation).to_sentence(words_connector: ", ", two_words_connector: ", ")
end
def product_and_full_name
@@ -69,6 +75,10 @@ module OpenFoodNetwork
private
def option_values_eager_loaded?
option_values.loaded?
end
def option_value_name
if has_attribute?(:display_as) && display_as.present?
display_as