raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-03 06:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enterprise user can edit profiles it has permission to

Browse Source
This commit is contained in:
Rohan Mitchell
2015-01-14 11:03:32 +11:00
parent 90ad2e2b7d
commit f6e9c9494c
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/enterprises_controller.rb
View File

@@ -76,8 +76,10 @@ module Admin
end
def collection
# TODO was ordered with is_distributor DESC as well, not sure why or how we want ot sort this now
Enterprise.managed_by(spree_current_user).order('is_primary_producer ASC, name')
# TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now
OpenFoodNetwork::Permissions.new(spree_current_user).
editable_enterprises.
order('is_primary_producer ASC, name')
end
def collection_actions

19
spec/features/admin/enterprises_spec.rb
View File

@@ -324,7 +324,9 @@ feature %q{
let(:supplier2) { create(:supplier_enterprise, name: 'Another Supplier') }
let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
let(:distributor2) { create(:distributor_enterprise, name: 'Another Distributor') }
let(:distributor3) { create(:distributor_enterprise, name: 'Yet Another Distributor') }
let(:enterprise_user) { create_enterprise_user }
let!(:er) { create(:enterprise_relationship, parent: distributor3, child: distributor1, permissions_list: [:edit_profile]) }
before(:each) do
enterprise_user.enterprise_roles.build(enterprise: supplier1).save
@@ -410,15 +412,26 @@ feature %q{
end
end
scenario "editing enterprises I have permission to" do
scenario "editing enterprises I manage" do
click_link 'Enterprises'
within('#listing_enterprises tbody tr:first') { click_link 'Edit Profile' }
within("#listing_enterprises tr.enterprise-#{distributor1.id}") { click_link 'Edit Profile' }
fill_in 'enterprise_name', :with => 'Eaterprises'
click_button 'Update'
flash_message.should == 'Enterprise "Eaterprises" has been successfully updated!'
page.should have_field 'enterprise_name', :with => 'Eaterprises'
distributor1.reload.name.should == 'Eaterprises'
end
scenario "editing enterprises I have permission to" do
click_link 'Enterprises'
within("#listing_enterprises tr.enterprise-#{distributor3.id}") { click_link 'Edit Profile' }
fill_in 'enterprise_name', :with => 'Eaterprises'
click_button 'Update'
flash_message.should == 'Enterprise "Eaterprises" has been successfully updated!'
distributor3.reload.name.should == 'Eaterprises'
end
scenario "editing images for an enterprise" do