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

Merge pull request #6121 from cillian/fix-shop-variant-search

Browse Source 
When searching for shop products check the variant :display_name and :display_as fields too
This commit is contained in:
Luis Ramos
2020-10-07 21:22:46 +01:00
committed by GitHub
parent 8626e7b433 6c22ee43a7
commit 48ea804615
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
View File

@@ -68,7 +68,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
id: $scope.order_cycle.order_cycle_id,
page: page || $scope.page,
per_page: $scope.per_page,
'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
'q[properties_id_or_supplier_properties_id_in_any][]': $scope.activeProperties,
'q[primary_taxon_id_in_any][]': $scope.activeTaxons
}

2
app/controllers/api/order_cycles_controller.rb
View File

@@ -75,7 +75,7 @@ module Api
end
def permitted_ransack_params
[:name_or_meta_keywords_or_supplier_name_cont,
[:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
:properties_id_or_supplier_properties_id_in_any,
:primary_taxon_id_in_any]
end

2
spec/features/consumer/shopping/shopping_spec.rb
View File

@@ -194,8 +194,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
end
it "returns search results for products where the search term matches one of the product's variant names" do
pending "has been broken for a while"
visit shop_path
fill_in "search", with: "Badg" # For variant with display_name "Badgers"