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

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

Browse Source 
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.

Conflicts:
	lib/open_food_network/order_and_distributor_report.rb
	spec/features/admin/variants_spec.rb
	spec/lib/open_food_network/order_and_distributor_report_spec.rb
This commit is contained in:
Rob Harrington
2015-10-08 14:50:41 +11:00
parent cdb0c2db33
commit ab7bfd10c5
25 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/variant_autocomplete_with_distribution_filter.js.coffee
View File

@@ -26,5 +26,5 @@ $.fn.variantAutocomplete = ->
formatResult: formatVariantResult
formatSelection: (variant) ->
$(@element).parent().children(".options_placeholder").html variant.unit_text
$(@element).parent().children(".options_placeholder").html variant.options_text
variant.name

2
app/assets/javascripts/darkswarm/services/cart.js.coffee
View File

@@ -86,5 +86,5 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, storage)->
variant.product_name
else
name = "#{variant.product_name} - #{variant.name_to_display}"
name += " (#{variant.unit_text})" if variant.unit_text
name += " (#{variant.options_text})" if variant.options_text
name