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

Add save_bar to the order cycles simple editing form

Browse Source
This commit is contained in:
Bing Xie
2016-05-04 11:22:25 +10:00
parent 26bb1a9beb
commit 3760a34b2b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
View File

@@ -9,6 +9,9 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
$scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
$scope.init()
$scope.$watch 'order_cycle_form.$dirty', (newValue) ->
StatusMessage.display 'notice', 'You have unsaved changes' if newValue
$scope.loaded = ->
Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
@@ -35,5 +38,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
OrderCycle.removeCoordinatorFee(index)
$scope.submit = (destination) ->
StatusMessage.display 'progress', "Saving..."
OrderCycle.mirrorIncomingToOutgoingProducts()
OrderCycle.update(destination)

13
spec/features/admin/order_cycles_spec.rb
View File

@@ -889,10 +889,10 @@ feature %q{
fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'zzy'
# And I make some product selections
uncheck "order_cycle_incoming_exchange_0_variants_#{v1.id}"
check "order_cycle_incoming_exchange_0_variants_#{v2.id}"
check "order_cycle_incoming_exchange_0_variants_#{v3.id}"
uncheck "order_cycle_incoming_exchange_0_variants_#{v3.id}"
find("#order_cycle_incoming_exchange_0_variants_#{v1.id}").trigger('click')
find("#order_cycle_incoming_exchange_0_variants_#{v2.id}").trigger('click')
find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
# And I select some fees and update
click_link 'order_cycle_coordinator_fee_0_remove'
@@ -901,9 +901,10 @@ feature %q{
select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
# When I update, or update and close, both work
click_button 'Update'
find_button('Update').trigger('click')
page.should have_content 'Your order cycle has been updated.'
click_button 'Update and Close'
find_button('Update and Close').trigger('click')
# Then my order cycle should have been updated
page.should have_content 'Your order cycle has been updated.'