From f7b4717f29fe40b4fbf8590145d7efbccde87850 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 18 May 2020 14:49:03 +0200 Subject: [PATCH] Improve validation code --- .../directives/validate_stock_quantity.js.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee index 404a9759e1..132f03c22a 100644 --- a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee @@ -4,10 +4,10 @@ Darkswarm.directive "validateStockQuantity", -> link: (scope, element, attr, ngModel) -> ngModel.$parsers.push (selectedQuantity) -> - if parseInt(selectedQuantity) > scope.available_quantity() - ngModel.$setValidity('stock', false); - else - ngModel.$setValidity('stock', true); + valid_number = parseInt(selectedQuantity) != NaN + valid_quantity = parseInt(selectedQuantity) <= scope.available_quantity() + + ngModel.$setValidity('stock', (valid_number && valid_quantity) ); selectedQuantity