lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVC: BaseListField + PortField, use getValidationMessage() to bootstrap defaults. found while working on https://github.com/opnsense/plugins/issues/1720, needed for the new NetworkAliasField type

Browse Source
This commit is contained in:
Ad Schellevis 2020-03-02 18:37:34 +01:00
parent 7bd1dab314
commit 6da8a2f558
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseListField.php
View File

@ -62,8 +62,19 @@ abstract class BaseListField extends BaseField
/**
* @var string default validation message string
*/
protected $internalValidationMessage = "option not in list";
protected $internalValidationMessage = null;
/**
* @return string validation message
*/
protected function getValidationMessage()
{
if ($this->internalValidationMessage == null) {
return "option not in list";
} else {
return $this->internalValidationMessage;
}
}
/**
* select if multiple interfaces may be selected at once
* @param $value boolean value 0/1
@ -124,14 +135,13 @@ abstract class BaseListField extends BaseField
$validators = parent::getValidators();
if ($this->internalValue != null) {
$domain = array_map('strval', array_keys($this->internalOptionList));
$this_message = $this->getValidationMessage();
if ($this->internalMultiSelect) {
// field may contain more than one option
$validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage,
'domain' => $domain));
$validators[] = new CsvListValidator(array('message' => $this_message, 'domain' => $domain));
} else {
// single option selection
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain' => $domain));
$validators[] = new InclusionIn(array('message' => $this_message, 'domain' => $domain));
}
}
return $validators;

2
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/PortField.php
View File

@ -143,7 +143,7 @@ class PortField extends BaseListField
/**
* return validation message
*/
private function getValidationMessage()
protected function getValidationMessage()
{
if ($this->internalValidationMessage == null) {
$msg = gettext('Please specify a valid port number (1-65535).');