raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent default form action from submitting ordercycle forms

Browse Source
This commit is contained in:
Rob Harrington
2015-01-21 14:46:03 +11:00
parent 9245af6a8f
commit d7ea81e821
7 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/order_cycle.js.erb.coffee
View File

@@ -74,7 +74,8 @@ angular.module('admin.order_cycles', ['ngResource'])
$scope.removeDistributionOfVariant = (variant_id) ->
OrderCycle.removeDistributionOfVariant(variant_id)
$scope.submit = ->
$scope.submit = (event) ->
event.preventDefault()
OrderCycle.create()
])
@@ -154,7 +155,8 @@ angular.module('admin.order_cycles', ['ngResource'])
$scope.removeDistributionOfVariant = (variant_id) ->
OrderCycle.removeDistributionOfVariant(variant_id)
$scope.submit = ->
$scope.submit = (event) ->
event.preventDefault()
OrderCycle.update()
])

3
app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
View File

@@ -38,6 +38,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl
$scope.enterpriseFeesForEnterprise = (enterprise_id) ->
EnterpriseFee.forEnterprise(parseInt(enterprise_id))
$scope.submit = ->
$scope.submit = (event) ->
event.preventDefault()
OrderCycle.mirrorIncomingToOutgoingProducts()
OrderCycle.create()

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

@@ -32,6 +32,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl",
$event.preventDefault()
OrderCycle.removeCoordinatorFee(index)
$scope.submit = ->
$scope.submit = (event) ->
event.preventDefault()
OrderCycle.mirrorIncomingToOutgoingProducts()
OrderCycle.update()

29
app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
View File

@@ -87,20 +87,21 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
load: (order_cycle_id, callback=null) ->
service = this
OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
angular.extend(service.order_cycle, oc)
service.order_cycle.incoming_exchanges = []
service.order_cycle.outgoing_exchanges = []
for exchange in service.order_cycle.exchanges
if exchange.incoming
angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
delete(exchange.receiver_id)
service.order_cycle.incoming_exchanges.push(exchange)
else
angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
delete(exchange.sender_id)
service.order_cycle.outgoing_exchanges.push(exchange)
delete oc.$promise
delete oc.$resolved
angular.extend(service.order_cycle, oc)
service.order_cycle.incoming_exchanges = []
service.order_cycle.outgoing_exchanges = []
for exchange in service.order_cycle.exchanges
if exchange.incoming
angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
delete(exchange.receiver_id)
service.order_cycle.incoming_exchanges.push(exchange)
else
angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
delete(exchange.sender_id)
service.order_cycle.outgoing_exchanges.push(exchange)
delete(service.order_cycle.exchanges)
service.loaded = true