From 5d8966694665ab2d36a2dfe158388364f652e992 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 22 Sep 2023 12:37:58 +0200 Subject: [PATCH] mvc: AutoNumberField validation message update --- .../Base/FieldTypes/AutoNumberField.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AutoNumberField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AutoNumberField.php index 38361e0ab..298efd588 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AutoNumberField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AutoNumberField.php @@ -43,11 +43,6 @@ class AutoNumberField extends BaseField */ protected $internalIsContainer = false; - /** - * @var string default validation message string - */ - protected $internalValidationMessage = "invalid integer value"; - /** * maximum value for this field * @var integer @@ -60,6 +55,14 @@ class AutoNumberField extends BaseField */ private $minimum_value; + /** + * {@inheritdoc} + */ + protected function defaultValidationMessage() + { + return gettext('Invalid integer value.'); + } + /** * constructor, set absolute min and max values * @param null|string $ref direct reference to this object @@ -68,6 +71,7 @@ class AutoNumberField extends BaseField public function __construct($ref = null, $tagname = null) { parent:: __construct($ref, $tagname); + $this->minimum_value = 1; $this->maximum_value = PHP_INT_MAX - 1; } @@ -130,11 +134,12 @@ class AutoNumberField extends BaseField $validators = parent::getValidators(); if ($this->internalValue != null) { - $validators[] = new IntegerValidator(array('message' => $this->internalValidationMessage)); - $validators[] = new MinMaxValidator(array('message' => $this->internalValidationMessage, - "min" => $this->minimum_value, - "max" => $this->maximum_value - )); + $validators[] = new IntegerValidator(['message' => $this->getValidationMessage()]); + $validators[] = new MinMaxValidator([ + 'message' => $this->getValidationMessage(), + 'min' => $this->minimum_value, + 'max' => $this->maximum_value, + ]); } return $validators; }