From 51155bb3682a6dba08cc9327dd97ef3385c4e8a0 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Fri, 19 Oct 2018 13:17:54 +0200 Subject: [PATCH] Remove old commented out code You know, git already keeps old code for us. --- app/assets/javascripts/admin/bulk_product_update.js.coffee | 7 ------- app/serializers/api/admin/product_serializer.rb | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 2a3497898b..4bf733da3e 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -65,13 +65,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout DirtyProducts.clear() StatusMessage.clear() - # $scope.matchProducer = (product) -> - # for producer in $scope.producers - # if angular.equals(producer.id, product.producer) - # product.producer = producer - # break - - $scope.updateOnHand = (product) -> on_demand_variants = [] if product.variants diff --git a/app/serializers/api/admin/product_serializer.rb b/app/serializers/api/admin/product_serializer.rb index 8af5701b94..ac0e472e79 100644 --- a/app/serializers/api/admin/product_serializer.rb +++ b/app/serializers/api/admin/product_serializer.rb @@ -5,7 +5,7 @@ class Api::Admin::ProductSerializer < ActiveModel::Serializer has_one :supplier, key: :producer_id, embed: :id has_one :primary_taxon, key: :category_id, embed: :id - has_many :variants, key: :variants, serializer: Api::Admin::VariantSerializer # embed: ids + has_many :variants, key: :variants, serializer: Api::Admin::VariantSerializer has_one :master, serializer: Api::Admin::VariantSerializer def image_url