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

Include producers I have permission to in BPE producers choice

Browse Source
This commit is contained in:
Rohan Mitchell
2014-09-01 10:44:09 +10:00
committed by summerscope
parent 9ec5dc6466
commit fbd4f98fa9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/admin/products_controller_decorator.rb
View File

@@ -85,7 +85,7 @@ Spree::Admin::ProductsController.class_eval do
def load_bpe_data
current_user.generate_spree_api_key! unless spree_current_user.spree_api_key
@spree_api_key = spree_current_user.spree_api_key
@producers = Enterprise.managed_by(spree_current_user).is_primary_producer.order(:name)
@producers = OpenFoodNetwork::Permissions.new(spree_current_user).managed_product_enterprises.is_primary_producer.by_name
@taxons = Spree::Taxon.order(:name)
end
end

4
spec/features/admin/bulk_product_update_spec.rb
View File

@@ -764,10 +764,10 @@ feature %q{
expect(page).to have_no_field 'product_name', with: product_not_supplied.name
end
it "shows only suppliers that I manage" do
it "shows only suppliers that I manage or have permission to" do
visit '/admin/products/bulk_edit'
expect(page).to have_select 'producer', with_options: [supplier_managed1.name, supplier_managed2.name], selected: supplier_managed1.name
expect(page).to have_select 'producer', with_options: [supplier_managed1.name, supplier_managed2.name, supplier_permitted.name], selected: supplier_managed1.name
expect(page).to have_no_select 'producer', with_options: [supplier_unmanaged.name]
end