raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4454 from luisramos0/sort_products

Browse Source 
Sort products alphabetically in OC edit page
This commit is contained in:
Luis Ramos
2019-11-27 22:27:42 +00:00
committed by GitHub
parent 7cc034c2bc 15bcde36cb
commit e0e833b2f3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
View File

@@ -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 }}'}

6
app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
View File

@@ -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.order(:name)
end
def products