Merge pull request spree-contrib#178 from InnovativeOperations/deprec…

…ations/distinct Update uniq to distinct
jkelleyj · Apr 26, 2018 · e7b875e · e7b875e
2 parents 87bea28 + f4e7d7b
commit e7b875e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/spree/admin/parts_controller.rb b/app/controllers/spree/admin/parts_controller.rb
@@ -20,7 +20,7 @@ def available
       @available_products = []
     else
       query = "%#{params[:q]}%"
-      @available_products = Spree::Product.search_can_be_part(query).uniq
+      @available_products = Spree::Product.search_can_be_part(query).distinct!
     end
     respond_to do |format|
       format.html {render :layout => false}

diff --git a/app/models/spree/line_item_decorator.rb b/app/models/spree/line_item_decorator.rb
@@ -1,6 +1,6 @@
 module Spree
   LineItem.class_eval do
-    scope :assemblies, -> { joins(product: :parts).uniq }
+    scope :assemblies, -> { joins(product: :parts).distinct }
 
     has_many :part_line_items, dependent: :destroy