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

Remove collection date from admin enterprises index

Browse Source
This commit is contained in:
Rob H
2014-04-24 13:57:56 +10:00
parent b59aa53158
commit c86586fc16
2 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/enterprises/index.html.erb
View File

@@ -14,7 +14,6 @@
<colgroup>
<col style="width: 20%;">
<col style="width: 5%;">
<col style="width: 20%;">
<col>
<col style="width: 20%;">
</colgroup>
@@ -23,7 +22,6 @@
<tr data-hook="enterprises_header">
<th>Name</th>
<th>Role</th>
<th>Next Collection Date/Time</th>
<th>Description</th>
<th></th>
</tr>
@@ -34,7 +32,6 @@
<tr class="enterprise-<%= enterprise.id %>">
<td><%= link_to enterprise.name, main_app.admin_enterprise_path(enterprise) %></td>
<td><%= 'PP ' if enterprise.is_primary_producer %><%= 'D' if enterprise.is_distributor %></td>
<td><%= enterprise_form.text_field :next_collection_at %></td>
<td><%= enterprise.description %></td>
<td data-hook="admin_users_index_row_actions">

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

@@ -127,26 +127,6 @@ feature %q{
page.should have_selector '#listing_enterprises a', text: 'Eaterprises'
end
scenario "updating many distributor next collection times at once" do
# Given three distributors
3.times { create(:distributor_enterprise) }
# When I go to the enterprises page
login_to_admin_section
click_link 'Enterprises'
# And I fill in some new collection times and save them
fill_in 'enterprise_set_collection_attributes_0_next_collection_at', :with => 'One'
fill_in 'enterprise_set_collection_attributes_1_next_collection_at', :with => 'Two'
fill_in 'enterprise_set_collection_attributes_2_next_collection_at', :with => 'Three'
click_button 'Update'
# Then my times should have been saved
flash_message.should == 'Distributor collection times updated.'
Enterprise.is_distributor.map { |d| d.next_collection_at }.sort.should == %w(One Two Three).sort
end
context 'as an Enterprise user' do
let(:supplier1) { create(:supplier_enterprise, name: 'First Supplier') }
let(:supplier2) { create(:supplier_enterprise, name: 'Another Supplier') }
@@ -203,21 +183,6 @@ feature %q{
page.should have_selector '#listing_enterprises a', text: 'Eaterprises'
end
scenario "can bulk edit enterprise collection dates/times for enterprises I have permission to" do
click_link 'Enterprises'
fill_in 'enterprise_set_collection_attributes_0_next_collection_at', :with => 'One'
fill_in 'enterprise_set_collection_attributes_1_next_collection_at', :with => 'Two'
click_button 'Update'
flash_message.should == 'Distributor collection times updated.'
supplier1.reload.next_collection_at.should == 'One'
distributor1.reload.next_collection_at.should == 'Two'
supplier2.reload.next_collection_at.should be_nil
distributor2.reload.next_collection_at.should be_nil
end
scenario "Editing images for an enterprise" do
click_link 'Enterprises'
first(".edit").click