|
 |
c58629 |
From a919a3ad3463eedee55b4aa2ae680c34241412b0 Mon Sep 17 00:00:00 2001
|
|
|
c58629 |
From: Pavel Vomacka <pvomacka@redhat.com>
|
|
|
c58629 |
Date: Tue, 11 Jul 2017 10:46:36 +0200
|
|
|
c58629 |
Subject: [PATCH] WebUI: Add positive number validator
|
|
|
c58629 |
|
|
|
c58629 |
Add new validator which inherits from integer validator
|
|
|
c58629 |
and checks whether the integer is positive.
|
|
|
c58629 |
|
|
|
c58629 |
https://pagure.io/freeipa/issue/6980
|
|
|
c58629 |
|
|
|
c58629 |
Reviewed-By: Felipe Volpone <felipevolpone@gmail.com>
|
|
|
c58629 |
Reviewed-By: Felipe Barreto <fbarreto@redhat.com>
|
|
|
c58629 |
---
|
|
|
c58629 |
install/ui/src/freeipa/field.js | 43 +++++++++++++++++++++++++++++++++++++++++
|
|
|
c58629 |
ipaserver/plugins/internal.py | 1 +
|
|
|
c58629 |
2 files changed, 44 insertions(+)
|
|
|
c58629 |
|
|
|
c58629 |
diff --git a/install/ui/src/freeipa/field.js b/install/ui/src/freeipa/field.js
|
|
|
c58629 |
index 76ce2533af5388ff5e1a2cfe8e35286f4e55b378..f998b578c38d91819fea418ea50e03589a691cbf 100644
|
|
|
c58629 |
--- a/install/ui/src/freeipa/field.js
|
|
|
c58629 |
+++ b/install/ui/src/freeipa/field.js
|
|
|
c58629 |
@@ -1049,9 +1049,51 @@ field.validator = IPA.validator = function(spec) {
|
|
|
c58629 |
return that.true_result();
|
|
|
c58629 |
};
|
|
|
c58629 |
|
|
|
c58629 |
+ that.integer_validate = that.validate;
|
|
|
c58629 |
+
|
|
|
c58629 |
return that;
|
|
|
c58629 |
};
|
|
|
c58629 |
|
|
|
c58629 |
+
|
|
|
c58629 |
+/**
|
|
|
c58629 |
+ * Javascript positive integer validator
|
|
|
c58629 |
+ *
|
|
|
c58629 |
+ * It allows to insert only positive integer.
|
|
|
c58629 |
+ *
|
|
|
c58629 |
+ * @class
|
|
|
c58629 |
+ * @alternateClassName IPA.positive_integer_validator
|
|
|
c58629 |
+ * @extends IPA.validator
|
|
|
c58629 |
+ */
|
|
|
c58629 |
+ field.positive_integer_validator = IPA.positive_integer_validator = function(spec) {
|
|
|
c58629 |
+
|
|
|
c58629 |
+ var that = IPA.integer_validator(spec);
|
|
|
c58629 |
+
|
|
|
c58629 |
+ /**
|
|
|
c58629 |
+ * @inheritDoc
|
|
|
c58629 |
+ */
|
|
|
c58629 |
+
|
|
|
c58629 |
+ that.validate = function(value) {
|
|
|
c58629 |
+
|
|
|
c58629 |
+ var integer_check = that.integer_validate(value);
|
|
|
c58629 |
+
|
|
|
c58629 |
+ if (!integer_check.valid) {
|
|
|
c58629 |
+ return integer_check;
|
|
|
c58629 |
+ }
|
|
|
c58629 |
+
|
|
|
c58629 |
+ var num = parseInt(value);
|
|
|
c58629 |
+
|
|
|
c58629 |
+ if (num <= 0) {
|
|
|
c58629 |
+ return that.false_result(
|
|
|
c58629 |
+ text.get('@i18n:widget.validation.positive_number'));
|
|
|
c58629 |
+ }
|
|
|
c58629 |
+
|
|
|
c58629 |
+ return that.true_result();
|
|
|
c58629 |
+ };
|
|
|
c58629 |
+
|
|
|
c58629 |
+ return that;
|
|
|
c58629 |
+ };
|
|
|
c58629 |
+
|
|
|
c58629 |
+
|
|
|
c58629 |
/**
|
|
|
c58629 |
* Metadata validator
|
|
|
c58629 |
*
|
|
|
c58629 |
@@ -1871,6 +1913,7 @@ field.register = function() {
|
|
|
c58629 |
v.register('unsupported', field.unsupported_validator);
|
|
|
c58629 |
v.register('same_password', field.same_password_validator);
|
|
|
c58629 |
v.register('integer', field.integer_validator);
|
|
|
c58629 |
+ v.register('positive_integer', field.positive_integer_validator);
|
|
|
c58629 |
|
|
|
c58629 |
l.register('adapter', field.Adapter);
|
|
|
c58629 |
l.register('object_adapter', field.ObjectAdapter);
|
|
|
c58629 |
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
|
|
|
c58629 |
index ff239db07ec1235c4174c6f9451c71195ab5a60a..c293e0b5e06677f09daa4b820ffd06a2671cd6e1 100644
|
|
|
c58629 |
--- a/ipaserver/plugins/internal.py
|
|
|
c58629 |
+++ b/ipaserver/plugins/internal.py
|
|
|
c58629 |
@@ -982,6 +982,7 @@ class i18n_messages(Command):
|
|
|
c58629 |
"min_value": _("Minimum value is ${value}"),
|
|
|
c58629 |
"net_address": _("Not a valid network address (examples: 2001:db8::/64, 192.0.2.0/24)"),
|
|
|
c58629 |
"parse": _("Parse error"),
|
|
|
c58629 |
+ "positive_number": _("Must be a positive number"),
|
|
|
c58629 |
"port": _("'${port}' is not a valid port"),
|
|
|
c58629 |
"required": _("Required field"),
|
|
|
c58629 |
"unsupported": _("Unsupported value"),
|
|
|
c58629 |
--
|
|
|
c58629 |
2.13.6
|
|
|
c58629 |
|