From 2cd5fcac5cb0128a0aad5d71113692371b003ca1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 22 Sep 2023 11:29:32 +0200 Subject: [PATCH] mvc: UnqiueIdField special validation message If we ever derive from UnqiueIdField we would end up overwriting this message and there is no data validation involved which the message would be for so it can be null as per BaseField. --- .../models/OPNsense/Base/FieldTypes/UniqueIdField.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UniqueIdField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UniqueIdField.php index f50ff1cc0..f179cee76 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UniqueIdField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UniqueIdField.php @@ -41,11 +41,6 @@ class UniqueIdField extends BaseField */ protected $internalIsContainer = false; - /** - * @var string default validation message string - */ - protected $internalValidationMessage = "Unique ID is immutable"; - /** * @var null|string initial field value */ @@ -67,8 +62,10 @@ class UniqueIdField extends BaseField } $validators = parent::getValidators(); // unique id may not change.. - $validators[] = new InclusionIn(array('message' => $this->internalValidationMessage, - 'domain' => array($this->initialValue))); + $validators[] = new InclusionIn([ + 'message' => gettext('Unique ID is immutable.'), + 'domain' => [$this->initialValue], + ]); return $validators; } }