From 8db8dd1b286ab1fd5aafb4d1cfac5268c47ad7cc Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Wed, 8 Aug 2018 16:20:40 -0400 Subject: [PATCH] Bug 7468: (follow-up) Make sure only integers are accepted as from/to values --- .../prog/en/modules/labels/label-edit-range.tt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt index 10acccc112..a48ced2758 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt @@ -15,17 +15,26 @@ function validate() { var error = false; - if (parseInt(document.getElementById("from-input").value) < 1) { + var from_input = document.getElementById("from-input").value; + var to_input = document.getElementById("to-input").value; + + if (isNaN(parseInt(from_input))) { + document.getElementById("from-error").innerHTML = " *Must be a positive integer"; + error = true; + } else if (parseInt(from_input) < 1) { document.getElementById("from-error").innerHTML = " *Cannot be smaller than 1"; error = true; } else { document.getElementById("from-error").innerHTML = ""; } - if (parseInt(document.getElementById("from-input").value) > parseInt(document.getElementById("to-input").value)) { + + if (isNaN(parseInt(to_input))) { + document.getElementById("to-error").innerHTML = " *Must be a positive integer"; + error = true; + } else if (parseInt(from_input) > parseInt(to_input)) { document.getElementById("to-error").innerHTML = " *Cannot be smaller than starting value"; error = true; - } - else { + } else { document.getElementById("to-error").innerHTML = ""; } -- 2.17.1