From 8ec2e6830d377cd6ab1725615f4b7e9061c73f72 Mon Sep 17 00:00:00 2001 From: Conrad Barthelmes Date: Tue, 5 Jan 2021 11:38:11 +0100 Subject: [PATCH 1/2] Added `{{ min }}` and `{{ max }}` parameters to Range constraint if both limits are used --- reference/constraints/Range.rst | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst index 5743d8d04ef..129acd98849 100644 --- a/reference/constraints/Range.rst +++ b/reference/constraints/Range.rst @@ -346,15 +346,17 @@ maxMessage **type**: ``string`` **default**: ``This value should be {{ limit }} or less.`` The message that will be shown if the underlying value is more than the -`max`_ option, and no `min`_ option has been defined (if both are defined, use -`notInRangeMessage`_). +`max`_ option, and **no** `min`_ option has been defined. + +If **both** are defined, use `notInRangeMessage`_ or use the parameter ``{{ max }}`` instead. You can use the following parameters in this message: =============== ============================================================== Parameter Description =============== ============================================================== -``{{ limit }}`` The upper limit +``{{ limit }}`` The upper limit (if only `max`_ is defined) +``{{ max }}`` The upper limit (if both `min`_ and `max`_ are defined) ``{{ value }}`` The current (invalid) value =============== ============================================================== @@ -394,15 +396,17 @@ minMessage **type**: ``string`` **default**: ``This value should be {{ limit }} or more.`` The message that will be shown if the underlying value is less than the -`min`_ option, and no `max`_ option has been defined (if both are defined, use -`notInRangeMessage`_). +`min`_ option, and **no** `max`_ option has been defined. + +If **both** are defined, use `notInRangeMessage`_ or use the parameter ``{{ min }}`` instead. You can use the following parameters in this message: =============== ============================================================== Parameter Description =============== ============================================================== -``{{ limit }}`` The lower limit +``{{ limit }}`` The lower limit (if only `min`_ is defined) +``{{ min }}`` The lower limit (if both `min`_ and `max`_ are defined) ``{{ value }}`` The current (invalid) value =============== ============================================================== From f15143c10bc836461594c6f8ef7daded1d870e60 Mon Sep 17 00:00:00 2001 From: Conrad Barthelmes Date: Mon, 18 Jan 2021 12:36:51 +0100 Subject: [PATCH 2/2] updated description according --- reference/constraints/Range.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst index 129acd98849..508f0582d0a 100644 --- a/reference/constraints/Range.rst +++ b/reference/constraints/Range.rst @@ -348,7 +348,7 @@ maxMessage The message that will be shown if the underlying value is more than the `max`_ option, and **no** `min`_ option has been defined. -If **both** are defined, use `notInRangeMessage`_ or use the parameter ``{{ max }}`` instead. +If **both** are defined, use `notInRangeMessage`_. You can use the following parameters in this message: @@ -398,7 +398,7 @@ minMessage The message that will be shown if the underlying value is less than the `min`_ option, and **no** `max`_ option has been defined. -If **both** are defined, use `notInRangeMessage`_ or use the parameter ``{{ min }}`` instead. +If **both** are defined, use `notInRangeMessage`_. You can use the following parameters in this message: