apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7817: create new shared function validateInteger().

Browse Source
This commit is contained in:
Jessica Wang 2011-01-21 10:11:50 -08:00
parent 671cce23ad
commit b0d390aef1
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/cloud.core.diskoffering.js
View File

@ -103,7 +103,7 @@ function initAddDiskOfferingDialog() {
isValid &= validateString("Description", thisDialog.find("#add_disk_description"), thisDialog.find("#add_disk_description_errormsg"));
if($("#add_disk_disksize_container").css("display") != "none")
isValid &= validateNumber("Disk size", thisDialog.find("#add_disk_disksize"), thisDialog.find("#add_disk_disksize_errormsg"), 0, null, false); //required
isValid &= validateInteger("Disk size", thisDialog.find("#add_disk_disksize"), thisDialog.find("#add_disk_disksize_errormsg"), 0, null, false); //required
isValid &= validateString("Tags", thisDialog.find("#add_disk_tags"), thisDialog.find("#add_disk_tags_errormsg"), true); //optional
if (!isValid)

17
ui/scripts/cloud.core.js
View File

@ -1464,7 +1464,11 @@ function validateDropDownBox(label, field, errMsgField, appendErrMsg) {
return isValid;
}
function validateNumber(label, field, errMsgField, min, max, isOptional) {
function validateInteger(label, field, errMsgField, min, max, isOptional) {
validateNumber(label, field, errMsgField, min, max, isOptional, "integer");
}
function validateNumber(label, field, errMsgField, min, max, isOptional, type) {
var isValid = true;
var errMsg = "";
var value = field.val();
@ -1472,7 +1476,13 @@ function validateNumber(label, field, errMsgField, min, max, isOptional) {
if(isNaN(value)) {
errMsg = label + " must be a number";
isValid = false;
} else {
}
else {
if(type == "integer" && (value % 1) != 0) {
errMsg = label + " must be an integer";
isValid = false;
}
if (min != null && value < min) {
errMsg = label + " must be a value greater than or equal to " + min;
isValid = false;
@ -1482,7 +1492,8 @@ function validateNumber(label, field, errMsgField, min, max, isOptional) {
isValid = false;
}
}
} else if(isOptional!=true){ //required field
}
else if(isOptional!=true){ //required field
errMsg = label + " is a required value. ";
isValid = false;
}