From 1c7237869abc226b80345a54b419c07f3fa15891 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 10 Nov 2019 19:37:38 +0000 Subject: [PATCH 1/3] Refactor products_scope to make it more simple --- .../api/admin/for_order_cycle/enterprise_serializer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb index 0d15bbb80b..bdf587ebf5 100644 --- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb +++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb @@ -34,11 +34,11 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer private def products_scope + products_relation = object.supplied_products if order_cycle.prefers_product_selection_from_coordinator_inventory_only? - object.supplied_products.visible_for(order_cycle.coordinator) - else - object.supplied_products + products_relation = products_relation.visible_for(order_cycle.coordinator) end + products_relation end def products From 6e51be095ba140a3ede541c4d642db600274c176 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 10 Nov 2019 20:02:39 +0000 Subject: [PATCH 2/3] Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically --- .../api/admin/for_order_cycle/enterprise_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb index bdf587ebf5..cdd78f5e5a 100644 --- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb +++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb @@ -38,7 +38,7 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer if order_cycle.prefers_product_selection_from_coordinator_inventory_only? products_relation = products_relation.visible_for(order_cycle.coordinator) end - products_relation + products_relation.order(:name) end def products From 15bcde36cbd67ab300b7a06cc61174c1a8af6843 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 26 Nov 2019 17:59:30 +0000 Subject: [PATCH 3/3] Remove order by filter on outgoing exchanges list of products The products are now coming from the server already sorted --- .../admin/panels/exchange_distributed_products.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml b/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml index 491ce46b66..4253f54aae 100644 --- a/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml +++ b/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml @@ -11,7 +11,7 @@ .exchange-products -# Scope product list based on permissions the current user has to view variants in this exchange - .exchange-product{'ng-repeat' => 'product in supplied_products | filter:productSuppliedToOrderCycle | visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges | orderBy:"name"' } + .exchange-product{'ng-repeat' => 'product in supplied_products | filter:productSuppliedToOrderCycle | visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges' } .exchange-product-details %label %img{'ng-src' => '{{ product.image_url }}'}