From 77ad84f47ebe2273b6ed010853cc28d53ef9e7a5 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Wed, 5 Sep 2012 14:45:26 +0200
Subject: Added decimal checks to metadata validator

Medatadata validator didn't have check for decimal values. It was added.

https://fedorahosted.org/freeipa/ticket/3052
---
 install/ui/field.js                | 16 +++++++++++++---
 install/ui/test/data/ipa_init.json |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'install/ui')

diff --git a/install/ui/field.js b/install/ui/field.js
index 8e2d116c0..5aa24c70e 100644
--- a/install/ui/field.js
+++ b/install/ui/field.js
@@ -430,21 +430,31 @@ IPA.metadata_validator = function(spec) {
 
         var message;
         var metadata = context.metadata;
+        var number = false;
 
         if (!metadata || IPA.is_empty(value)) return that.true_result();
 
-        if (metadata.type == 'int') {
+        if (metadata.type === 'int') {
+            number = true;
             if (!value.match(/^-?\d+$/)) {
                 return that.false_result(IPA.messages.widget.validation.integer);
             }
+        } else if (metadata.type === 'Decimal') {
+            number = true;
+            if (!value.match(/^-?\d+(\.\d+)?$/)) {
+                return that.false_result(IPA.messages.widget.validation.decimal);
+            }
+        }
+
+        if (number) {
 
-            if (metadata.minvalue !== undefined && value < metadata.minvalue) {
+            if (metadata.minvalue !== undefined && Number(value) < Number(metadata.minvalue)) {
                 message = IPA.messages.widget.validation.min_value;
                 message = message.replace('${value}', metadata.minvalue);
                 return that.false_result(message);
             }
 
-            if (metadata.maxvalue !== undefined && value > metadata.maxvalue) {
+            if (metadata.maxvalue !== undefined && Number(value) > Number(metadata.maxvalue)) {
                 message = IPA.messages.widget.validation.max_value;
                 message = message.replace('${value}', metadata.maxvalue);
                 return that.false_result(message);
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 74d01706d..24364dafa 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -523,6 +523,7 @@
                         "undo_all": "undo all",
                         "validation": {
                             "error": "Text does not match field pattern",
+                            "decimal": "Must be a decimal number",
                             "integer": "Must be an integer",
                             "ip_address": "Not a valid IP address",
                             "ip_v4_address": "Not a valid IPv4 address",
-- 
cgit