Preventing default submit behaviour for order cycle form submission buttons

This commit is contained in:
Rob Harrington
2016-04-17 22:05:41 +10:00
parent 97e53900ad
commit cf94d67caf
8 changed files with 20 additions and 8 deletions

View File

@@ -79,5 +79,6 @@ angular.module('admin.orderCycles')
$scope.removeDistributionOfVariant = (variant_id) ->
OrderCycle.removeDistributionOfVariant(variant_id)
$scope.submit = (destination) ->
$scope.submit = ($event, destination) ->
$event.preventDefault()
OrderCycle.create(destination)

View File

@@ -85,6 +85,11 @@ angular.module('admin.orderCycles')
OrderCycle.removeDistributionOfVariant(variant_id)
$scope.submit = (destination) ->
$event.preventDefault()
StatusMessage.display 'progress', "Saving..."
$scope.submit = ($event, destination) ->
$event.preventDefault()
StatusMessage.display 'progress', "Saving..."
OrderCycle.update(destination)
$scope.order_cycle_form.$setPristine()

View File

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

View File

@@ -37,7 +37,8 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
$event.preventDefault()
OrderCycle.removeCoordinatorFee(index)
$scope.submit = (destination) ->
$scope.submit = ($event, destination) ->
$event.preventDefault()
StatusMessage.display 'progress', "Saving..."
OrderCycle.mirrorIncomingToOutgoingProducts()
OrderCycle.update(destination)

View File

@@ -4,4 +4,4 @@
%h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
{{ StatusMessage.statusMessage.text || " " }}
.eight.columns.omega.text-right
%input{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { class: "button.class", click: "button.action(button.param)" } }
%input{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { class: "button.class", click: "button.action($event, button.param)" } }

View File

@@ -51,7 +51,7 @@
.actions
- if @order_cycle.new_record?
= f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
= f.submit 'Create', 'ng-click' => "submit($event, '#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
%span{'ng-show' => 'loaded()'}
= link_to 'Cancel', main_app.admin_order_cycles_path

View File

@@ -22,7 +22,7 @@
.actions
- if @order_cycle.new_record?
= f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
= f.submit 'Create', 'ng-click' => "submit($event, '#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
%span{'ng-show' => 'loaded()'}
= link_to 'Cancel', main_app.admin_order_cycles_path

View File

@@ -156,7 +156,9 @@ describe 'OrderCycle controllers', ->
expect(OrderCycle.removeDistributionOfVariant).toHaveBeenCalledWith('variant')
it 'Submits the order cycle via OrderCycle create', ->
scope.submit('/admin/order_cycles')
eventMock = {preventDefault: jasmine.createSpy()}
scope.submit(eventMock,'/admin/order_cycles')
expect(eventMock.preventDefault).toHaveBeenCalled()
expect(OrderCycle.create).toHaveBeenCalledWith('/admin/order_cycles')
describe 'AdminEditOrderCycleCtrl', ->
@@ -321,7 +323,9 @@ describe 'OrderCycle controllers', ->
expect(OrderCycle.removeDistributionOfVariant).toHaveBeenCalledWith('variant')
it 'Submits the order cycle via OrderCycle update', ->
scope.submit('/admin/order_cycles')
eventMock = {preventDefault: jasmine.createSpy()}
scope.submit(eventMock,'/admin/order_cycles')
expect(eventMock.preventDefault).toHaveBeenCalled()
expect(OrderCycle.update).toHaveBeenCalledWith('/admin/order_cycles')
expect(scope.order_cycle_form.$setPristine.calls.length).toEqual 1